DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: cc17b28c0c
am: 1834734eef -s ours
Change-Id: I4831f02cbd58cb0592352ed2450ac2a1615b37c0
This commit is contained in: