Merge "Revert "Use futures for binding and talking to the ExternalStorageService.""