Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc
am: 0d2044af4b

Change-Id: I7f622c50449e231d3bcf32dc3fee5ba2f14f8da1