Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471  -s ours
am: 0e09e8c201

Change-Id: I07157359ef396832b3c20b745dc09c32b3e85db6