Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 3f0a9dbf65 am: 8e6281da55

Change-Id: I0714a642766e8d6624ff2bc856c6f77c900fa814