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