--- a/buildfarm/maintenance/production-masters.json
+++ b/buildfarm/maintenance/production-masters.json
@@ -325,25 +325,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm51-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -389,25 +393,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm52-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -453,25 +461,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm53-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -517,25 +529,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm54-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -581,25 +597,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm67-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -645,25 +665,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm68-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -1871,25 +1895,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm113-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -1935,25 +1963,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm114-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -1999,25 +2031,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm115-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",
@@ -2063,25 +2099,29 @@
       "android-armv6"
     ],
     "limit_tb_platforms": [
       "linux64"
     ],
     "limit_b2g_platforms": [
       "linux64_gecko",
       "emulator-jb",
+      "emulator-kk",
       "emulator"
     ],
     "limit_b2g_slave_platforms": {
       "linux64_gecko": [
         "ubuntu64_vm-b2gdt"
       ],
       "emulator-jb": [
         "ubuntu64_vm-b2g-emulator-jb"
       ],
+      "emulator-kk": [
+        "ubuntu64_vm-b2g-emulator-kk"
+      ],
       "emulator": [
         "ubuntu64_vm-b2g-emulator"
       ]
     },
     "master_dir": "/builds/buildbot/tests1-linux64/master",
     "name": "bm116-tests1-linux64",
     "pb_port": 9201,
     "role": "tests",