Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5
am: c510e19d18

Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f