Merge changes Ifd9a205e,I5d358413,I4f693297