Merge changes I2bcf43f5,I0c974ee4 am: ab651635e8

Change-Id: I2215f6e82a51428a5b2c66518fef7fc7d67cec46