diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js
index b3c60924a..5d7a6744c 100644
--- a/src/utils/CertificateProvider.js
+++ b/src/utils/CertificateProvider.js
@@ -19,7 +19,7 @@ const tmpFile = promisify(tmp.file);
 const tmpDir = promisify(tmp.dir);
 import iosUtil from '../fb-stubs/iOSContainerUtility.tsx';
 import {reportPlatformFailures} from './metrics';
-import {getAdbClient} from './adbClient';
+import {getAdbClient} from './adbClient.tsx';
 import * as androidUtil from './androidContainerUtility';
 
 // Desktop file paths
diff --git a/src/utils/adbClient.js b/src/utils/adbClient.tsx
similarity index 86%
rename from src/utils/adbClient.js
rename to src/utils/adbClient.tsx
index 883127cad..1a7300580 100644
--- a/src/utils/adbClient.js
+++ b/src/utils/adbClient.tsx
@@ -28,15 +28,9 @@ function createClient() {
     ? `${process.env.ANDROID_HOME}/platform-tools/adb`
     : 'adb';
   return reportPlatformFailures(
-    promisify(child_process.exec)(`${adbPath} start-server`)
-      .then(result => {
-        if (result.error) {
-          throw new Error(
-            `Failed to start adb server: ${result.stderr.toString()}`,
-          );
-        }
-      })
-      .then(() => adbkit.createClient(adbConfig())),
+    promisify(child_process.exec)(`${adbPath} start-server`).then(() =>
+      adbkit.createClient(adbConfig()),
+    ),
     'createADBClient.shell',
   ).catch(err => {
     console.error(
diff --git a/src/utils/androidContainerUtilityInternal.js b/src/utils/androidContainerUtilityInternal.js
index bd5281ef2..f7b7fd86e 100644
--- a/src/utils/androidContainerUtilityInternal.js
+++ b/src/utils/androidContainerUtilityInternal.js
@@ -10,7 +10,7 @@
  * opaque types will ensure the commands are only ever run on validated
  * arguments.
  */
-import {getAdbClient} from './adbClient';
+import {getAdbClient} from './adbClient.tsx';
 import {UnsupportedError} from './metrics';
 const adbkit = require('adbkit-fb');