diff --git a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
index d76dc28..c9d904f 100644
--- a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
+++ b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
@@ -1109,7 +1109,7 @@
      * @throws IllegalArgumentException
      */
     private void doRunTest(ITestLifeCycleReceiver listener)
-            throws RuntimeException, IllegalArgumentException {
+            throws RuntimeException, IllegalArgumentException, DeviceNotAvailableException {
         CLog.i("Device serial number: " + mDevice.getSerialNumber());
 
         setTestCaseDataDir();
@@ -1255,6 +1255,14 @@
           CLog.i("Deleted the runner json config file, %s.", jsonFilePath);
         }
 
+        // If the framework was disabled in python, make sure we re-enable it no matter what.
+        // The python side never re-enable the framework.
+        if (mBinaryTestDisableFramework) {
+            for (ITestDevice device : mInvocationContext.getDevices()) {
+                device.executeShellCommand("start");
+            }
+        }
+
         if (interruptMessage != null) {
             throw new RunInterruptedException(interruptMessage);
         }