Merge "Use correct uid when querying usage data for specific user."