Merge changes Ic28c5653,Ic635f97b
am: 1ea3d9411a

Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de