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