Merge changes from topic "am-d272918e-a99d-4306-988b-0886b4086a2c" into oc-dev
am: 3e47f07076

Change-Id: Ia55c4e707686108cd7174de31b6dc527d532fe9d