Merge "Remove "activeusers-updated" cache key usage"