Merge changes I1c2c08cc,I76a0b43d,Ifa718fb0
am: b19a3aaa32

Change-Id: I6b78f7abfef4f8ad4e960d1b711fbac5596e3627