Merge changes from topic "am-35cf956b-e4b9-4d71-8e67-b3f3e90a9e22" into oc-dev
am: b012d872de

Change-Id: Id26d030af689ff2ed9df3db42828bf09991534cf