Merge "Make CONTRIB compatible with Kubernetes v1.17"