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

Change-Id: I5302de302163f2f341e770b7fd48df245554174e