Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31
am: 5536402f6d

Change-Id: I90da8f03fecb6307cfae5bd4a8fec48a6136d29f