Merge changes If4de1e1f,I11493096,I256c7758
am: 6bfbdc7fe3

Change-Id: I3df78002f54a5faff2acaff8bc63bc7f9d023240