Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from...
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690c am: c510e19d
am: 67dbaa8a
Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846