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