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

Change-Id: I23fe0c7c446c3c2ed0570606a4ac9860df866295