Merge changes Ie6600c35,I62bf6bb2
am: 067fec5c3f

Change-Id: Ibb58a57613dfbbc2e86a3f1a809d4a4d2139be29