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

Change-Id: I81c9ccd2c72f1e7df73c45c7f667c5b8b34b0f81