Merge "Provide remote_storage_adapter variables"