Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315
am: 3985bf958e
Change-Id: Ib79d5010b4de507e66cb9a301c152d2f3c81d706
This commit is contained in: