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

Change-Id: I2af45e1ce5415cd33884f1a40a9c2bb2ea92a6e9