Merge changes If64a9720,I31c3b54c
am: 22e7b7dd78

Change-Id: I3022b14a7b2ebac6bbc1cd031406fb8614ca1cbe