Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223
am: 8469d52d41  -s ours

Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76