Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev am: 5b882b9d am: 9ce893db am: 053160d9 Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3