Merge changes Ie8b78c7c,If02081d2
am: fe177b78d7

Change-Id: I2720d1e1433367e9f584451408951dce0b61e0da