Merge "use UID instead of user ID for metrics according to design doc."