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
am: b4c5c522e3

Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0