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

Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc