Merge "Use correct call to get Android user ID"