Merge "User: Migrate from foreign cache to global cache for UserRightsProxy"