Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev am: 59113c7a51 am: 9e6abebb10 am: 0bb60e7f96
am: adef549187

Change-Id: Ibb7bc5423d99d4ddb0b24a450f9994418267a7e3