Merge changes I5e684409,I4fa35540,I24015ef0
am: 93de77745c

Change-Id: I2ac9d2922435058bcd900f902c308736f6710bed