DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: 9285808f9d
am: 3f68664be2 -s ours
Change-Id: I19c59253ddf20ec3d5d8fed6075408919d9ab06b
This commit is contained in: