Merge "Add tests ExternalStorageHostTests to presubmit" into sc-dev