Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am: 2ef9262f9a am: e7a0ce2afa
am: beba3a40c5

Change-Id: Ibba0785249088330d4477aecdabc1fd638dda5af