Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c392
am: 72ec6ee567

Change-Id: Idd143a0e350d035b8f401547bf7809a23c9f0a93