Merge changes Ic3741f89,I21472a39