DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5
am: 1007b773b9
Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef
This commit is contained in: