Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e am: 80630710 am: d4eff25f
am: 9c3cc880 -s ours
Change-Id: Idbd485ae40ffb78dea134903fbcbb52bcca89b52