Merge changes Ie6600c35,I62bf6bb2 am: 067fec5c3f am: 03f0a706af
am: 0c08b1f615

Change-Id: Ieef0eb2c4176406cc9f9fd0b67d58b84f5b27ee6