Merge "Better debugging messages for cross-user checks."