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
Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
This commit is contained in: