Merge changes I2c9eb095,I66f8faba
am: 0901d5919a

Change-Id: Ia73ac6a3e7bebfeaf7efc8331e8a890d553c8cf0