Merge changes Ic53c9f04,Iae5644f6,Ib3975607