Merge changes I1c2c08cc,I76a0b43d,Ifa718fb0 am: b19a3aaa32
am: 45b779f1ef

Change-Id: Ic1f275c47c7a488c29839bd9268eefdb420a6321