Merge changes Ie762ce75,I611fd791 am: 21a57f263f
am: cc9f695ba0

Change-Id: I39dbc3c3c7e69e87e12977fb173379e60c74a3d9