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