Merge changes from topic "am-7b9b57bd-d6e0-4db4-8b44-08b16768f93f" into oc-dev am: a4eba4957c am: a017b6bc9c am: fa8f4ae5ae
am: c271f204a0

Change-Id: I051e21ac5634c6e712f8685dccef7314b8a4f212