Merge changes Ie6c1832a,I0275ffca
am: 4d61417997

Change-Id: Ib91acdef4fe77256d48788cca2fa754fa02d52d0