Merge changes Ic6e79b83,I4135ff1c
am: 417a8e2376

Change-Id: I2eb3e1393143427f1f83c25423053522508958e2