Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186
am: fefdff353f

Change-Id: Ib2772d84dc02ef1b3ec12e7347528b7c3d601a5f