diff --git a/config/config.json b/config/config.json
index 8ba1653ca2..10054dee4b 100644
--- a/config/config.json
+++ b/config/config.json
@@ -4,5 +4,6 @@
 	"PROXY_PORT": 8888,
 	"PROXY_HOSTNAME": "127.0.0.1",
 	"TYPESCRIPT_COMPILER_OPTIONS": {},
-	"CI_LOGGER": false
+	"CI_LOGGER": false,
+	"ANDROID_DEBUG_UI_MAC": "Google Chrome"
 }
\ No newline at end of file
diff --git a/docs/man_pages/project/testing/debug-android.md b/docs/man_pages/project/testing/debug-android.md
index c574745c33..b4c0c711f2 100644
--- a/docs/man_pages/project/testing/debug-android.md
+++ b/docs/man_pages/project/testing/debug-android.md
@@ -30,10 +30,10 @@ Debugs your project on a connected device, in a native emulator or in Genymotion
 * `<Emulator Options>` is any valid combination of options as listed by `$ tns help emulate android`
 * `<GenyName>` is the name of the Genymotion virtual device that you want to use as listed by `$ genyshell -c "devices list"`
  
-<% if(isHtml) { %> 
-### Prerequisites
+<% if(isHtml) { %>
+###Prerequisites
 
-* You must have Chrome installed on your system.
+* You must have Chrome installed on your system.<br/>If you are using a non-standard named Chrome app on an OS X system (for example, a nightly Canary update), you need to set this name in the `ANDROID_DEBUG_UI_MAC` setting in the NativeScript [config.json](file:///<%= #{config.getConfigPath(config)} %>).
 
 ### Related Commands
 
diff --git a/lib/common b/lib/common
index 9d7b712b79..2639b3516d 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 9d7b712b79776fb023c9514deb70f24a1d5f2fab
+Subproject commit 2639b3516d34b3bb0c40a727e874ce14133144db
diff --git a/lib/config.ts b/lib/config.ts
index beb73ba12d..57a11c3bd5 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -11,6 +11,7 @@ export class Configuration extends configBaseLib.ConfigBase implements IConfigur
 	DEBUG = false;
 	TYPESCRIPT_COMPILER_OPTIONS = {};
 	USE_PROXY = false;
+	ANDROID_DEBUG_UI_MAC = "Google Chrome";
 
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {
diff --git a/lib/declarations.ts b/lib/declarations.ts
index 7a756b6121..7052549853 100644
--- a/lib/declarations.ts
+++ b/lib/declarations.ts
@@ -32,7 +32,9 @@ interface IDependencyData {
 
 interface IStaticConfig extends Config.IStaticConfig { }
 
-interface IConfiguration extends Config.IConfig { }
+interface IConfiguration extends Config.IConfig {
+	ANDROID_DEBUG_UI_MAC: string;
+}
 
 interface IApplicationPackage {
 	packageName: string;