diff --git a/Gruntfile.js b/Gruntfile.js
index 1092b3de2..0dd880f37 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -372,7 +372,7 @@ module.exports = function(grunt) {
 
   // Build android
   grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']);
-  grunt.registerTask('build-android-debug', ['exec:build_android_debug']);
+  grunt.registerTask('build-android-debug', ['default', 'exec:build_android_debug']);
   grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']);
   grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']);
   grunt.registerTask('sign-android', ['exec:sign_android']);
diff --git a/app-template/package-template.json b/app-template/package-template.json
index 11b15bfcd..d3fd9670d 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -126,7 +126,7 @@
     "start":                  "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0",
     "start:chrome":           "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"",
     "start:android":          "grunt start-android",
-    "start:android-emulator": "grunt start-android",
+    "start:android-emulator": "grunt start-android-emulator",
     "start:android-log":      "grunt start-android && npm run log:android",
     "start:ios":              "grunt start-ios",
     "start:windows":          "npm run build:www && npm run build:windows",