Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2 am: 60fb81edda
am: f84cc88320

Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24