Sync code

Sync the code between repositories

Change-Id: Idf027c4d37dbd594a1e63a668b0f421a733cf4c6
Issue-ID: SDC-1874
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
4 files changed