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

Change-Id: I604956b3959cad56e7fa7c39e4fd51fc8c42a5c7