Merge changes Ie10042ca,Ic5203951
am: d519d9c79f

Change-Id: Ic7b7d32605006da0a6b1d7e817cc05e0d27f3512