Merge changes Ic19071c7,Icc8dc4ae