Merge "Use kube-addon-manager service"