Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c46 am: 5eb85f01 am: 03720668 Change-Id: If981740986af74936a82d496eab591d8009e3613