Merge "Deprecate scoped directory access."