Merge changes Iece631a5,I53769e0e
am: fbd6f3c796

Change-Id: If31c5f12c2f556670f51fe1840b0efdd84b4d3e2