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