DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29
am: e6f2767d54
Change-Id: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77
This commit is contained in: