Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
am: 6b8ae05e36

Change-Id: I3390fac08bf7047fce526b2553c1fb2908c4167c