Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 am: e14c028ff7 am: e3c46b0a49
am: 606174973c

Change-Id: Ie2b71a3ea04f272332fa980f82a30bbfd62cb4f1