Internal change

src/java/com/google/devtools/deviceinfra/ext/devicemanagement/device/platform/android/AndroidDeviceDelegate.java

@@ -449,6 +449,7 @@ private void basicAndroidDriverConfiguration() throws InterruptedException {
     device.addSupportedDriver("AndroidInstrumentation");
     device.addSupportedDriver("AndroidNativeBin");
     device.addSupportedDriver("AndroidRoboTest");
+    device.addSupportedDriver("MoblyTest");
     device.addSupportedDriver("NoOpDriver");
     device.addSupportedDriver("XtsTradefedTest");
   }

src/java/com/google/devtools/deviceinfra/ext/devicemanagement/device/platform/android/realdevice/AndroidRealDeviceDelegate.java

@@ -309,6 +309,7 @@ private void setUpFastbootModeDevice() throws MobileHarnessException, Interrupte
       setUpOnlineModeDevice();
     } else {
       device.addSupportedDriver(AndroidRealDeviceConstants.NO_OP_DRIVER);
+      device.addSupportedDriver(AndroidRealDeviceConstants.MOBLY_TEST_DRIVER);
       String hardware = fastboot.getVar(deviceId, FastbootProperty.PRODUCT);
       if (!Strings.isNullOrEmpty(hardware)) {
         device.updateDimension(Dimension.Name.HARDWARE, hardware);

src/java/com/google/wireless/qa/mobileharness/shared/api/device/NoOpDevice.java

@@ -58,6 +58,7 @@ public NoOpDevice(
   public void setUp() throws MobileHarnessException, InterruptedException {
     super.setUp();
     addSupportedDriver("NoOpDriver");
+    addSupportedDriver("MoblyTest");
 
     addSupportedDecorator("NoOpDecorator");
 

src/javatests/com/google/devtools/mobileharness/shared/size/BinarySizeTest.java

@@ -47,7 +47,7 @@ public class BinarySizeTest {
   private static final long MAX_BASE_OLC_SERVER_BINARY_SIZE_BYTE = 31_650_000L;
   private static final long MAX_ATS_OLC_SERVER_BINARY_SIZE_BYTE = 41_850_000L;
   private static final long MAX_ATS_OLC_SERVER_LOCAL_MODE_BINARY_SIZE_BYTE = 41_950_000L;
-  private static final long MAX_LAB_SERVER_BINARY_SIZE_BYTE = 40_500_000L;
+  private static final long MAX_LAB_SERVER_BINARY_SIZE_BYTE = 40_550_000L;
   private static final long MAX_ATS_CONSOLE_BINARY_SIZE_BYTE = 23_750_000L;
   private static final long MAX_XTS_TRADEFED_AGENT_BINARY_SIZE_BYTE = 4_550_000L;