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 am: 394357761e  -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5