Merge changes Iafd12677,I40595d15
am: 0599c5976a

Change-Id: I71f0f22446cf13cbc87ebd5b97021b9df13c8c26