DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5
am: f51e8e8642
Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320
This commit is contained in: