Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c
am: 76ce0386db
Change-Id: I1a5282c25eba331df935ab2863c33406e8b694fb
This commit is contained in: