Sync with upstream changes for service-password