Merge changes Ib0dab687,Ia7e45116,I6839ad8b