Merge "[CDS] Make CDS compatible with Kubernetes v1.17"