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

Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c