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

Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e