Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: 709c6fb8a9 am: a1cbcd6e00

Change-Id: Ibbe33fae9f12785abd62b24711e07c4030c949da