Merge "Make APPC compatible with Kubernetes v1.17"