Merge changes If1ecc3b4,Ied1b369d,I4e492279,I30a4b7fe
am: e5f1e62682

Change-Id: I3afd588c705c4321b42807584cb47f8500f9bddf