Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656
am: e46c142ad5

Change-Id: Ic7bc8c3913ff56dce95d110cd26cd09aa93daad1