Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b1 am: fefdff35 am: bae17b1a Change-Id: I1cd543688afefa72d37eea3579b992c33900d862