Merge changes Ia25fc20d,I0b2ff209,I33768fc9