Merge "SECURITY: Throttle uploads"