Merge "Use UserHandles instead of userId integers."