Merge "Give the default storage manager access to the storage permissions." into nyc-mr1-dev