Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev am: 46fc48f57e am: b39e49d52c
am: 1c4ccab92b

Change-Id: I32ba85cdc40ea77772361ffb399085f7b8a67416