Merge changes from topic "am-7c53888a-745f-41b0-bfc8-21ee3f17b58d" into oc-dev am: bbb4493b am: 3a87a392 am: b178a213 am: 02ae74e2 Change-Id: If299c8dab0505f96bfe178a41f4842fa2eceb764