Merge changes Iea2a3055,I6582cfc6
am: 45562bfb63

Change-Id: Ic1e986c5554bcb191b025afec41fc051f9714574