Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c
am: 7c0ea478a8

Change-Id: I5b1974499b3dba96134a14ab5b00a8942a02fe6f