Merge changes Iec59c32f,If2f4b65e am: c9456fe943
am: c3e1c1324e

Change-Id: Iaf47c845579e53b1adedea43afdf9ea0a5d1a6fa