Merge changes Ib795f077,I723e4262