DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73
am: 73f95823f8 -s ours
Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18
This commit is contained in:
6f13f73b73
am: 73f95823f8 -s ours
Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18