Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am: 320ae6c3 am: 72ec6ee5 am: d8c17b81" into oc-mr1-dev-plus-aosp