Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am: cfbf7a21c3 am: d2eb52dd7b
am: 8a312ab779

Change-Id: Idba2de531bdd4a6ea3ac3e4831332076f6a3b4da