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: I85d3cd8cb4d67258132cb89f1dbdb4dc75bc8d1b
This commit is contained in: