Merge "Update kube-addon-manager to latest upstream version"