Merge "Add external_storage properties." into rvc-dev