Merge changes Ia72bdfab,I72df9feb
am: e1eafe6624

Change-Id: I37486caf94907aabb16dfc38497b4bba76756dde