Merge changes I2bcf43f5,I0c974ee4 am: ab651635e8 am: b673164414

Change-Id: Iacb6ba72b92d6b2d96ec25106d6a46b68892ad6c