Merge "Allow primary dirs under cross-user root as well." into mainline-prod