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 am: 4b0164b2 am: 00af0a6d am: b4c5c522
am: 4d1c25ec  -s ours

Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd