Merge "Add nullcheck to StorageSettings." into nyc-dev