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

Change-Id: I99efbc2cb86b455a72752ca72902c86e1a0e21ea