Merge "Cross-user provider access no longer requires ..._FULL"