Merge "Revert "No direct Uri grants from system.""