Merge changes Ie7a1b820,If986af3a,Iaf4016c7
am: e8d1c1adeb

Change-Id: I5e53d1202ba0fcbfd08cd4798af572f57ea74941