Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9dd7 am: 9ce893db7d am: 053160d965
am: a5f49873c1

Change-Id: Iff391bdbc66ec59c30f36fc14e9501c7fb770f30