Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078 am: 0d2044af am: f1ff9486 Change-Id: Ia9ca0839e05779d02560b07e1ab7103d9779c06e