Merge changes Ibb30bb90,I15bff10d
am: f593071c4d

Change-Id: Ib7a83c32f83fc89b01d1359d35489c280a66b4a1