global auto organize imports.
Change-Id: I8742bf3465762485fbbc5376bb6aca5042657f6d
diff --git a/prod-tests/src/com/android/bluetooth/tests/BluetoothStressTest.java b/prod-tests/src/com/android/bluetooth/tests/BluetoothStressTest.java
index ff78131..4d48e6f 100644
--- a/prod-tests/src/com/android/bluetooth/tests/BluetoothStressTest.java
+++ b/prod-tests/src/com/android/bluetooth/tests/BluetoothStressTest.java
@@ -32,6 +32,9 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -52,9 +55,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
/**
* Runs the Bluetooth stress testcases.
* FIXME: more details on what the testcases do
diff --git a/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java b/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
index 3fa53bf..f2e1dcc 100644
--- a/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
+++ b/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
@@ -29,6 +29,8 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,8 +38,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Runs the encryption CPU benchmarks
* <p>
diff --git a/prod-tests/src/com/android/encryption/tests/EncryptionStressTest.java b/prod-tests/src/com/android/encryption/tests/EncryptionStressTest.java
index cf8ebeb..e6e59ee 100644
--- a/prod-tests/src/com/android/encryption/tests/EncryptionStressTest.java
+++ b/prod-tests/src/com/android/encryption/tests/EncryptionStressTest.java
@@ -25,11 +25,11 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.SimpleStats;
+import junit.framework.Assert;
+
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Runs the encryption stress tests.
* <p>
diff --git a/prod-tests/src/com/android/framework/tests/BandwidthMicroBenchMarkTest.java b/prod-tests/src/com/android/framework/tests/BandwidthMicroBenchMarkTest.java
index e051f88..48de6f9 100644
--- a/prod-tests/src/com/android/framework/tests/BandwidthMicroBenchMarkTest.java
+++ b/prod-tests/src/com/android/framework/tests/BandwidthMicroBenchMarkTest.java
@@ -27,17 +27,18 @@
import com.android.tradefed.result.TestResult;
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.IRunUtil.IRunnableResult;
+import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.net.HttpHelper;
import com.android.tradefed.util.net.IHttpHelper;
import com.android.tradefed.util.net.IHttpHelper.DataSizeException;
+import junit.framework.Assert;
+
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
/**
* Test that instruments a bandwidth test, gathers bandwidth metrics, and posts
diff --git a/prod-tests/src/com/android/framework/tests/FrameworkStressTest.java b/prod-tests/src/com/android/framework/tests/FrameworkStressTest.java
index 11a3a67..431e4db 100644
--- a/prod-tests/src/com/android/framework/tests/FrameworkStressTest.java
+++ b/prod-tests/src/com/android/framework/tests/FrameworkStressTest.java
@@ -37,11 +37,12 @@
import com.android.tradefed.util.brillopad.section.syslog.JavaCrashParser;
import com.android.tradefed.util.brillopad.section.syslog.NativeCrashParser;
+import junit.framework.Assert;
+
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
/**
* Test that instruments a stress test package, gathers iterations metrics, and posts the results.
diff --git a/prod-tests/src/com/android/framework/tests/PackageManagerHostTestUtils.java b/prod-tests/src/com/android/framework/tests/PackageManagerHostTestUtils.java
index c123932..008a653 100644
--- a/prod-tests/src/com/android/framework/tests/PackageManagerHostTestUtils.java
+++ b/prod-tests/src/com/android/framework/tests/PackageManagerHostTestUtils.java
@@ -23,12 +23,12 @@
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.result.CollectingTestListener;
+import junit.framework.Assert;
+
import java.io.File;
import java.util.Map;
import java.util.Map.Entry;
-import junit.framework.Assert;
-
/**
* Set of tests that verify host side install cases
*/
diff --git a/prod-tests/src/com/android/framework/tests/TestDirForwarder.java b/prod-tests/src/com/android/framework/tests/TestDirForwarder.java
index 1de0b6f..66e1c01 100644
--- a/prod-tests/src/com/android/framework/tests/TestDirForwarder.java
+++ b/prod-tests/src/com/android/framework/tests/TestDirForwarder.java
@@ -21,6 +21,7 @@
import com.android.tradefed.config.ConfigurationException;
import com.android.tradefed.config.IConfiguration;
import com.android.tradefed.config.IConfigurationReceiver;
+import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.targetprep.BuildError;
diff --git a/prod-tests/src/com/android/graphics/tests/OpenGlPerformanceTest.java b/prod-tests/src/com/android/graphics/tests/OpenGlPerformanceTest.java
index e44d5cf..3da28d7 100644
--- a/prod-tests/src/com/android/graphics/tests/OpenGlPerformanceTest.java
+++ b/prod-tests/src/com/android/graphics/tests/OpenGlPerformanceTest.java
@@ -22,6 +22,7 @@
import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.result.BugreportCollector;
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.InputStreamSource;
@@ -29,20 +30,19 @@
import com.android.tradefed.result.SnapshotInputStreamSource;
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.log.LogUtil.CLog;
+
+import junit.framework.Assert;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Run the OpenGl performance test. The OpenGl performance test benchmarks the performance
* of RenderScript in Android System.
diff --git a/prod-tests/src/com/android/graphics/tests/UserActionBenchmark.java b/prod-tests/src/com/android/graphics/tests/UserActionBenchmark.java
index 7bf9482..69aed36 100644
--- a/prod-tests/src/com/android/graphics/tests/UserActionBenchmark.java
+++ b/prod-tests/src/com/android/graphics/tests/UserActionBenchmark.java
@@ -30,6 +30,8 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -41,8 +43,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
/**
* Runs the user action framerate benchmark test. This test capture
* use the scripted monkey to inject the keyevent to mimic the real
diff --git a/prod-tests/src/com/android/media/tests/CameraLatencyTest.java b/prod-tests/src/com/android/media/tests/CameraLatencyTest.java
index 86e805f..4cb1794 100644
--- a/prod-tests/src/com/android/media/tests/CameraLatencyTest.java
+++ b/prod-tests/src/com/android/media/tests/CameraLatencyTest.java
@@ -20,34 +20,33 @@
import com.android.ddmlib.Log;
import com.android.ddmlib.testrunner.IRemoteAndroidTestRunner;
import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
-
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.IDeviceTest;
-import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.result.CollectingTestListener;
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.InputStreamSource;
import com.android.tradefed.result.LogDataType;
import com.android.tradefed.result.SnapshotInputStreamSource;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
/**
* Runs the Camera latency testcases.
* FIXME: more details
diff --git a/prod-tests/src/com/android/media/tests/CameraStressTest.java b/prod-tests/src/com/android/media/tests/CameraStressTest.java
index c5fa460..bd807c5 100644
--- a/prod-tests/src/com/android/media/tests/CameraStressTest.java
+++ b/prod-tests/src/com/android/media/tests/CameraStressTest.java
@@ -20,34 +20,33 @@
import com.android.ddmlib.Log;
import com.android.ddmlib.testrunner.IRemoteAndroidTestRunner;
import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
-
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.IDeviceTest;
-import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.result.CollectingTestListener;
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.InputStreamSource;
import com.android.tradefed.result.LogDataType;
import com.android.tradefed.result.SnapshotInputStreamSource;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
/**
* Runs the Camera stress testcases.
* FIXME: more details
diff --git a/prod-tests/src/com/android/media/tests/MediaMemoryTest.java b/prod-tests/src/com/android/media/tests/MediaMemoryTest.java
index b4f29b1..306e3d3 100644
--- a/prod-tests/src/com/android/media/tests/MediaMemoryTest.java
+++ b/prod-tests/src/com/android/media/tests/MediaMemoryTest.java
@@ -35,6 +35,8 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -47,8 +49,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
/**
* Runs the Media memory test. This test will do various media actions ( ie.
* playback, recording and etc.) then capture the snapshot of mediaserver memory
diff --git a/prod-tests/src/com/android/media/tests/MediaPlayerStressTest.java b/prod-tests/src/com/android/media/tests/MediaPlayerStressTest.java
index 71e1bb2..08e8b4b 100644
--- a/prod-tests/src/com/android/media/tests/MediaPlayerStressTest.java
+++ b/prod-tests/src/com/android/media/tests/MediaPlayerStressTest.java
@@ -35,6 +35,8 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -46,8 +48,6 @@
import java.util.ListIterator;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Runs the Media Player stress test. This test will play the video files under
* the /sdcard/samples folder and capture the video playback event statistics in
diff --git a/prod-tests/src/com/android/media/tests/MediaStressTest.java b/prod-tests/src/com/android/media/tests/MediaStressTest.java
index 6e04867..133a14a 100644
--- a/prod-tests/src/com/android/media/tests/MediaStressTest.java
+++ b/prod-tests/src/com/android/media/tests/MediaStressTest.java
@@ -20,17 +20,18 @@
import com.android.ddmlib.Log;
import com.android.ddmlib.testrunner.IRemoteAndroidTestRunner;
import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
-
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.IDeviceTest;
-import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.InputStreamSource;
import com.android.tradefed.result.LogDataType;
import com.android.tradefed.result.SnapshotInputStreamSource;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -43,8 +44,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
/**
* Runs the Media stress testcases.
* FIXME: more details
diff --git a/prod-tests/src/com/android/media/tests/VideoEditingMemoryTest.java b/prod-tests/src/com/android/media/tests/VideoEditingMemoryTest.java
index f377381..cf4d79c 100644
--- a/prod-tests/src/com/android/media/tests/VideoEditingMemoryTest.java
+++ b/prod-tests/src/com/android/media/tests/VideoEditingMemoryTest.java
@@ -35,6 +35,8 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -47,8 +49,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
/**
* Runs the Video Editing Framework Memory Tests. This test exercise the basic
* functionality of video editing test and capture the memory usage. The memory
diff --git a/prod-tests/src/com/android/media/tests/VideoEditingPerformanceTest.java b/prod-tests/src/com/android/media/tests/VideoEditingPerformanceTest.java
index 5d9a9df..02554a2 100644
--- a/prod-tests/src/com/android/media/tests/VideoEditingPerformanceTest.java
+++ b/prod-tests/src/com/android/media/tests/VideoEditingPerformanceTest.java
@@ -35,6 +35,8 @@
import com.android.tradefed.util.RegexTrie;
import com.android.tradefed.util.StreamUtil;
+import junit.framework.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -46,8 +48,6 @@
import java.util.ListIterator;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Runs the Video Editing Framework Performance Test.The performance test result
* is saved in /sdcard/VideoEditorPerformance.txt
diff --git a/prod-tests/src/com/android/ota/tests/OtaStabilityTest.java b/prod-tests/src/com/android/ota/tests/OtaStabilityTest.java
index db9e9be..31fe1bd 100644
--- a/prod-tests/src/com/android/ota/tests/OtaStabilityTest.java
+++ b/prod-tests/src/com/android/ota/tests/OtaStabilityTest.java
@@ -21,8 +21,8 @@
import com.android.tradefed.config.IConfiguration;
import com.android.tradefed.config.IConfigurationReceiver;
import com.android.tradefed.config.Option;
-import com.android.tradefed.config.OptionClass;
import com.android.tradefed.config.Option.Importance;
+import com.android.tradefed.config.OptionClass;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.log.LogUtil.CLog;
@@ -42,6 +42,9 @@
import com.android.tradefed.util.IRunUtil;
import com.android.tradefed.util.RunUtil;
+import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -50,9 +53,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
/**
* A test that will flash a build on a device, wait for the device to be OTA-ed to another build,
* and then repeat N times.
diff --git a/prod-tests/src/com/android/ota/tests/OtaStabilityTestTest.java b/prod-tests/src/com/android/ota/tests/OtaStabilityTestTest.java
index d590df4..1216c83 100644
--- a/prod-tests/src/com/android/ota/tests/OtaStabilityTestTest.java
+++ b/prod-tests/src/com/android/ota/tests/OtaStabilityTestTest.java
@@ -17,11 +17,11 @@
import com.android.tradefed.testtype.IRemoteTest;
+import junit.framework.TestCase;
+
import java.util.Collection;
import java.util.Iterator;
-import junit.framework.TestCase;
-
/**
* Unit tests for {@link OtaStabilityTest}
*/
diff --git a/prod-tests/src/com/android/performance/tests/FioBenchmarkTest.java b/prod-tests/src/com/android/performance/tests/FioBenchmarkTest.java
index b461caf..52596b8 100644
--- a/prod-tests/src/com/android/performance/tests/FioBenchmarkTest.java
+++ b/prod-tests/src/com/android/performance/tests/FioBenchmarkTest.java
@@ -31,6 +31,9 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -42,9 +45,6 @@
import java.util.Map.Entry;
import java.util.Set;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
/**
* Runs the FIO benchmarks.
* <p>
diff --git a/prod-tests/src/com/android/performance/tests/StartupMetricsTest.java b/prod-tests/src/com/android/performance/tests/StartupMetricsTest.java
index 7f413a4..0081b48 100644
--- a/prod-tests/src/com/android/performance/tests/StartupMetricsTest.java
+++ b/prod-tests/src/com/android/performance/tests/StartupMetricsTest.java
@@ -34,12 +34,12 @@
import com.android.tradefed.util.brillopad.section.MemInfoParser;
import com.android.tradefed.util.brillopad.section.ProcRankParser;
+import junit.framework.Assert;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Tests to gather device metrics from during and immediately after boot
*/
diff --git a/prod-tests/src/com/android/sdk/tests/SdkLibTest.java b/prod-tests/src/com/android/sdk/tests/SdkLibTest.java
index 4b24e34..59131a5 100644
--- a/prod-tests/src/com/android/sdk/tests/SdkLibTest.java
+++ b/prod-tests/src/com/android/sdk/tests/SdkLibTest.java
@@ -26,6 +26,9 @@
import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.TestLoader;
+import junit.framework.Assert;
+import junit.framework.Test;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
@@ -33,9 +36,6 @@
import java.util.Collection;
import java.util.List;
-import junit.framework.Assert;
-import junit.framework.Test;
-
/**
* A class for running all the unit tests for SDK java libraries.
* <p/>
diff --git a/prod-tests/src/com/android/sdk/tests/SdkTestAppTest.java b/prod-tests/src/com/android/sdk/tests/SdkTestAppTest.java
index db31c51..b3af86f 100644
--- a/prod-tests/src/com/android/sdk/tests/SdkTestAppTest.java
+++ b/prod-tests/src/com/android/sdk/tests/SdkTestAppTest.java
@@ -31,6 +31,9 @@
import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.xml.AndroidManifestWriter;
+import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -41,9 +44,6 @@
import java.util.Collections;
import java.util.Properties;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
/**
* A class that builds all the test-apps included in an SDK with ant, against all targets included
* in SDK, and verifies success.
diff --git a/prod-tests/src/com/android/wireless/tests/RadioHelper.java b/prod-tests/src/com/android/wireless/tests/RadioHelper.java
index 419a2c0..48752f2 100644
--- a/prod-tests/src/com/android/wireless/tests/RadioHelper.java
+++ b/prod-tests/src/com/android/wireless/tests/RadioHelper.java
@@ -21,8 +21,6 @@
import com.android.tradefed.util.IRunUtil;
import com.android.tradefed.util.RunUtil;
-import java.util.Arrays;
-
/**
* Helper class to get device radio settings
*/
diff --git a/prod-tests/src/com/android/wireless/tests/RadioStressTest.java b/prod-tests/src/com/android/wireless/tests/RadioStressTest.java
index f35fd02..c31e411 100644
--- a/prod-tests/src/com/android/wireless/tests/RadioStressTest.java
+++ b/prod-tests/src/com/android/wireless/tests/RadioStressTest.java
@@ -20,6 +20,7 @@
import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.result.BugreportCollector;
import com.android.tradefed.result.CollectingTestListener;
import com.android.tradefed.result.ITestInvocationListener;
@@ -29,13 +30,12 @@
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.IRunUtil;
import com.android.tradefed.util.RunUtil;
-import com.android.tradefed.log.LogUtil.CLog;
+
+import junit.framework.Assert;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Run radio startup stress test. The test stresses the radio by run-time reboot a device
* for multiple times. In each iteration, voice and/or data connection is verified.
diff --git a/prod-tests/src/com/android/wireless/tests/TelephonyTest.java b/prod-tests/src/com/android/wireless/tests/TelephonyTest.java
index 58a4034..9a9f7fb 100644
--- a/prod-tests/src/com/android/wireless/tests/TelephonyTest.java
+++ b/prod-tests/src/com/android/wireless/tests/TelephonyTest.java
@@ -27,6 +27,8 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
+import junit.framework.Assert;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -34,8 +36,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
-
/**
* Run radio outgoing call stress test. The test stresses the voice connection when making
* outgoing calls, number of failures will be collected and reported.
diff --git a/prod-tests/src/com/android/wireless/tests/WifiStressTest.java b/prod-tests/src/com/android/wireless/tests/WifiStressTest.java
index a2a5076..942d1e1 100644
--- a/prod-tests/src/com/android/wireless/tests/WifiStressTest.java
+++ b/prod-tests/src/com/android/wireless/tests/WifiStressTest.java
@@ -21,6 +21,7 @@
import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.result.BugreportCollector;
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.InputStreamSource;
@@ -29,22 +30,21 @@
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.util.RegexTrie;
-import com.android.tradefed.log.LogUtil.CLog;
+
+import junit.framework.Assert;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
/**
* Run the WiFi stress tests. This test stresses WiFi soft ap, WiFi scanning
* and WiFi reconnection in which device switches between cellular and WiFi connection.