Merge changes Ib8bdaa14,I62380485,I6cbedbd2
am: b7f136bed4

Change-Id: I2f39f0c70b27c5143676247fa0a86deb0999a5f4