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

Change-Id: I532b675a10ae9e21f28f3aa38d0f2e85ac080faa