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