Merge "Add remote_storage_adapter service"