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 am: c2a168d0ea
am: 82ac124868 -s ours
Change-Id: I22c9a4420754e792c72bb317e58d01f322c3aad5
This commit is contained in: