Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5 am: 5d65931a -s ours am: f82c3730
am: 8c9ff681
Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b