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
am: 626d56f2bf

Change-Id: Ie4d1de5eec8d3b54ba9067f7cabd3d87814e084d