Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d am: 5536402f am: 6db504c6 am: 609145c3 am: 3985bf95
am: 635ebe5d -s ours
Change-Id: I30e5d2fbe96d4c25bdeac139537f9575fe9c8cb6