DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours
am: 9346bec730

Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8