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