Merge changes I4193809b,I65e9ad89,I2c01b898,I5e9195b7 am: 7177b997b9 am: 19911c79c8 am: 873e096a3b
am: 7b72ea4323

Change-Id: I6d28a81485ff39682ac67df2b63d69a6b966aeab