Merge changes Idf4eb009,I7b531524,I2c6353cd,I45a59de7
am: 218769eeaa

Change-Id: I3d7532522a3e21886714e2f1135a556c6de619bd