Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev
am: ee97cf22ba

Change-Id: Ia9e780f378a33f48434d1e98760091d3642c8990