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