Merge "Support cross-user lookups" into mainline-prod