Merge "Make COMMON/COMMON compatible with Kubernetes v1.17"