Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: d4eff25f9f
am: 9c3cc88067  -s ours

Change-Id: Idbd485ae40ffb78dea134903fbcbb52bcca89b52