Merge changes I4193809b,I65e9ad89,I2c01b898,I5e9195b7 am: 7177b997b9
am: 19911c79c8

Change-Id: I7cc5dddd8f6bd7a15dad4819402637c089fe1383