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