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