Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:...
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac3 -s ours am: b058dc13
am: d20b04a4 -s ours
Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01