Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev am: 11eddd5a22
am: 9353b051f9

Change-Id: Idc0ff3824ed1bf9b7cca41702379a79bf12544f2