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

Change-Id: Ic16f826b5ea55bd5c5050468b45bef454385b3ac