Merge "Changes to support sso: repositories for upload"