Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96
am: 44042a74c7

Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f