Related upstream change: https://github.com/GoogleCloudPlatform/kubernetes/commit/18bcef52351ec1402e433e1efade76efbc1155e5