Merge "Add external_storage properties."