--- a/testing/mozharness/scripts/get_apk.py
+++ b/testing/mozharness/scripts/get_apk.py
@@ -52,17 +52,18 @@ class GetAPK(BaseScript, VirtualenvMixin
             "help": "Use this option to clean the download directory",
             "action": "store_true",
             "default": False
         }]
     ]
 
     arch_values = ["arm", "x86"]
     multi_api_archs = ["arm"]
-    multi_apis = ["api-9", "api-15"] # v11 has been dropped in fx 46 (1155801)
+    multi_apis = ["api-15"] # v11 has been dropped in fx 46 (1155801)
+    # v9 has been dropped in fx 48 (1220184)
 
     download_dir = "apk-download"
 
     apk_ext = ".apk"
     checksums_ext = ".checksums"
     android_prefix = "android-"
 
     # Cleanup half downloaded files on Ctrl+C

--- a/testing/mozharness/scripts/push_apk.py
+++ b/testing/mozharness/scripts/push_apk.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 """ push_apk.py
 
     Upload the apk of a Firefox app on Google play
     Example for a beta upload:
-    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v9=/path/to/fennec-XX.0bY.multi.android-arm-v9.apk --apk-armv7-v15=/path/to/fennec-XX.0bY.multi.android-arm-v15.apk --track production --push_apk
+    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v15=/path/to/fennec-XX.0bY.multi.android-arm-v15.apk --track production --push_apk
 
     Debian/Ubuntu dependencies: python-googleapi python-oauth2client
 """
 import sys
 import os
 
 from oauth2client import client
 
@@ -123,17 +123,17 @@ class PushAPK(BaseScript, GooglePlayMixi
 
         if self.config['package_name'] not in self.package_name_values:
             self.fatal("Unknown package name value " +
                        self.config['package_name'])
 
         if not os.path.isfile(self.config['apk_file_x86']):
             self.fatal("Could not find " + self.config['apk_file_x86'])
 
-        if not os.path.isfile(self.config['apk_file_armv7_v9']):
+        if self.config.get('apk_file_armv7_v9') and not os.path.isfile(self.config['apk_file_armv7_v9']):
             self.fatal("Could not find " + self.config['apk_file_armv7_v9'])
 
         if not os.path.isfile(self.config['apk_file_armv7_v15']):
             self.fatal("Could not find " + self.config['apk_file_armv7_v15'])
 
         if self.config.get('apk_file_armv6') and not os.path.isfile(self.config['apk_file_armv6']):
             self.fatal("Could not find " + self.config['apk_file_armv6'])
 
@@ -210,19 +210,21 @@ class PushAPK(BaseScript, GooglePlayMixi
         commit_request = service.edits().commit(
             editId=edit_id, packageName=self.config['package_name']).execute()
         self.log('Edit "%s" has been committed' % (commit_request['id']))
 
     def push_apk(self):
         """ Upload the APK files """
         self.check_argument()
         service = self.connect_to_play()
-        apks = [self.config['apk_file_armv7_v9'], self.config['apk_file_armv7_v15'], self.config['apk_file_x86']]
+        apks = [self.config['apk_file_armv7_v15'], self.config['apk_file_x86']]
         if self.config.get('apk_file_armv6'):
             apks.append(self.config['apk_file_armv6'])
+        if self.config.get('apk_file_armv7_v9'):
+            apks.append(self.config['apk_file_armv7_v9'])
         self.upload_apks(service, apks)
 
     def test(self):
         """ Test if the connexion can be done """
         self.check_argument()
         self.connect_to_play()
 
 # main {{{1