Merge changes Iaf918ce3,I60032b97 am: 2efe92bdbe
am: 3548c97042

Change-Id: Ie53da942315c74cc43e843f6d003fb004b766484