diff --git a/lib/common/mobile/android/android-emulator-services.ts b/lib/common/mobile/android/android-emulator-services.ts
index a901981d19..414eeb1976 100644
--- a/lib/common/mobile/android/android-emulator-services.ts
+++ b/lib/common/mobile/android/android-emulator-services.ts
@@ -144,7 +144,15 @@ export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService
 	}
 
 	private getBestFit(emulators: Mobile.IDeviceInfo[]) {
-		const best = _(emulators).maxBy(emulator => emulator.version);
+		let best: Mobile.IDeviceInfo = null;
+		for (const emulator of emulators) {
+			const currentVersion = emulator.version && semver.coerce(emulator.version);
+			const currentBestVersion = best && best.version && semver.coerce(best.version);
+			if (!best || (currentVersion && currentBestVersion && semver.gt(currentVersion, currentBestVersion))) {
+				best = emulator;
+			}
+		}
+
 		const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
 		const bestVersion = best && best.version && semver.coerce(best.version);
 
diff --git a/lib/common/test/unit-tests/services/json-file-settings-service.ts b/lib/common/test/unit-tests/services/json-file-settings-service.ts
index 2ca75d297f..a7e946fcb3 100644
--- a/lib/common/test/unit-tests/services/json-file-settings-service.ts
+++ b/lib/common/test/unit-tests/services/json-file-settings-service.ts
@@ -129,7 +129,7 @@ describe("jsonFileSettingsService", () => {
 			const result = await new Promise((resolve, reject) => {
 				setTimeout(() => {
 					jsonFileSettingsService.getSettingValue<number>("prop1", { cacheTimeout: 1 }).then(resolve, reject);
-				}, 2);
+				}, 10);
 			});
 
 			assert.equal(result, null);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 914a1c5f07..349795898d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 672fa8599d..d4c91177bb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "6.3.1",
+  "version": "6.3.2",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {