diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index ffea3cd01..33c35a4aa 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -20,14 +20,7 @@
 ################################################################################
 
 export KARTS_DEFAULT="all"
-export TRACKS_DEFAULT="abyss arena_candela_city battleisland cave             \
-                       cornfield_crossing endcutscene featunlocked fortmagma  \
-                       gplose gpwin hacienda icy_soccer_field introcutscene   \
-                       introcutscene2 lasdunasarena lasdunassoccer lighthouse \
-                       mines minigolf olivermath overworld pumpkin_park       \
-                       ravenbridge_mansion sandtrack scotland snowmountain    \
-                       snowtuxpeak soccer_field stadium stk_enterprise temple \
-                       tutorial volcano_island xr591 zengarden"
+export TRACKS_DEFAULT="all"
 
 export TEXTURE_SIZE_DEFAULT=256
 export JPEG_QUALITY_DEFAULT=85
diff --git a/android/make.sh b/android/make.sh
index 6b0fecf9f..cef1d8ec1 100755
--- a/android/make.sh
+++ b/android/make.sh
@@ -594,4 +594,10 @@ export ANDROID_HOME="$SDK_PATH"
           -Pbuild_tools_ver="$BUILD_TOOLS_VER"       \
           $GRADLE_BUILD_TYPE
 
+if [ "$GRADLE_BUILD_TYPE" = "assembleRelease" ]; then
+./gradlew -Pcompile_sdk_version=$COMPILE_SDK_VERSION \
+          -Pbuild_tools_ver="$BUILD_TOOLS_VER"       \
+          "bundleRelease"
+fi
+
 check_error
diff --git a/src/states_screens/dialogs/download_assets.cpp b/src/states_screens/dialogs/download_assets.cpp
index 721d7efe8..fd8a643b1 100644
--- a/src/states_screens/dialogs/download_assets.cpp
+++ b/src/states_screens/dialogs/download_assets.cpp
@@ -104,7 +104,7 @@ DownloadAssets::DownloadAssets()
 
     // I18N: In download assets dialog
     core::stringw msg = _("SuperTuxKart will download full assets "
-        "(including all tracks, high quality textures and music) for better "
+        "(including high quality textures and music) for better "
         "gaming experience, this will use your mobile data if you don't have "
         "a wifi connection.");
     getWidget<BubbleWidget>("description")->setText(msg);