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

Change-Id: Ib48b137e5881c75e16a314f04b5ba1a547d763f2