Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev
am: a9e5b5dce0

Change-Id: Id8fb16f96cd87b7aeb8cf501a70952e877ac0210