Merge changes Ib3354417,I400cf4cc
am: b3d294dd8f

Change-Id: I063ff0827ff4769c558b2b5100caba9d4b884a76