Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173
am: 4b3c59005b
Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210
This commit is contained in: