diff --git a/docs/man_pages/project/testing/debug-android.md b/docs/man_pages/project/testing/debug-android.md
index 5ee960f34e..b941bb8b5a 100644
--- a/docs/man_pages/project/testing/debug-android.md
+++ b/docs/man_pages/project/testing/debug-android.md
@@ -15,7 +15,6 @@ Livesync on device, run the app and stop at the first code statement | `$ tns de
 Livesync in the native emulator, run the app and stop at the first code statement | `$ tns debug android --no-rebuild --debug-brk --emulator [<Emulator Options>] [--timeout <timeout>]`
 Livesync in Genymotion, run the app and stop at the first code statement | `$ tns debug android --no-rebuild --debug-brk --geny <Geny Name> [--timeout <timeout>]`
 Livesync on device/emulator, run the app, start and attach the debugger. Refresh everything automatically upon changes | `$ tns debug android --watch [--debug-brk]`
-Retrieve the device port on which you are debugging | `$ tns debug android [--device <Device ID>] --get-port`
 Detach the debug tools | `$ tns debug android --stop`
 
 Debugs your project on a connected device, in a native emulator or in Genymotion.
@@ -27,7 +26,6 @@ Debugs your project on a connected device, in a native emulator or in Genymotion
 * `--debug-brk` - Prepares, builds and deploys the application package on a device or in an emulator, launches the Chrome DevTools of your Chrome browser and stops at the first code statement.
 * `--start` - Attaches the debug tools to a deployed and running app.
 * `--stop` - Detaches the debug tools.
-* `--get-port` - Retrieves the port on which you are debugging your application.
 * `--debug-port` - Sets a new port on which to attach the debug tools.
 * `--timeout` - Sets the number of seconds that the NativeScript CLI will wait for the debugger to boot. If not set, the default timeout is 90 seconds.
 * `--no-rebuild` - Livesyncs to device/emulator when possible. Otherwise builds and deploys the application.
diff --git a/lib/common b/lib/common
index 49f49a807f..37e2e8bde6 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 49f49a807fa1121e8a90f05f9b5dc450f3dd5354
+Subproject commit 37e2e8bde6ed6547f0d61c53659c63749bc0267f
diff --git a/lib/services/android-debug-service.ts b/lib/services/android-debug-service.ts
index 1403a8af60..11f6e1b61d 100644
--- a/lib/services/android-debug-service.ts
+++ b/lib/services/android-debug-service.ts
@@ -106,7 +106,7 @@ class AndroidDebugService implements IDebugService {
 		return (() => {
 			let packageFile = "";
 
-			if (!this.$options.start && !this.$options.emulator && !this.$options.getPort) {
+			if (!this.$options.start && !this.$options.emulator) {
 				let cachedDeviceOption = this.$options.forDevice;
 				this.$options.forDevice = true;
 				this.$options.forDevice = !!cachedDeviceOption;
@@ -127,9 +127,9 @@ class AndroidDebugService implements IDebugService {
 		return (() => {
 			this.device = device;
 
-			if (this.$options.getPort) {
-				this.printDebugPort(device.deviceInfo.identifier, packageName).wait();
-			} else if (this.$options.start) {
+			this.printDebugPort(device.deviceInfo.identifier, packageName).wait();
+
+			if (this.$options.start) {
 				this.attachDebugger(device.deviceInfo.identifier, packageName).wait();
 			} else if (this.$options.stop) {
 				this.detachDebugger(packageName).wait();