Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev am: 2833e406e0
am: ed9361ce1c

Change-Id: I8c538a46f02f4d46ddc5d78ee19612649c15a46c