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