Merge changes Ib244a98f,Ib173f251 am: 0730260a6a
am: 612c390937

Change-Id: Ibfa78f619962cc40ef003a295fd8caf495e4e6df