Sync code

Sync the code between repositories

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