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 am: 4d1c25ec43  -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98

Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258