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

Change-Id: Ifb11c9795b60056fa3407085d33b8a98a704b4e2