Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f26 am: cc9f695b am: 164854bd" into oc-dev-plus-aosp am: b09b8547 Change-Id: I8b1b20d81efa2d86345b3b15600bed4cd40bb6e8