Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c
am: 00af0a6d2c

Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0