Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi