Merge changes Ib7d53620,I2d4c5d64 am: bca1b9dab1

Change-Id: Icfe823bf2238e912f63313c5de2f4e511f5b033a