Merge "Fix cross-user content resolver tests."