Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am: 3e4faac39f  -s ours

Change-Id: If1ea6da6679874ca13379222a28c529421c80b23