diff --git a/script/style/checkstyle.xml b/script/style/checkstyle.xml
index a9e48a4fe..cb0b13dca 100644
--- a/script/style/checkstyle.xml
+++ b/script/style/checkstyle.xml
@@ -197,9 +197,10 @@
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
         <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="sortImportsInGroupAlphabetically" value="false"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="standardPackageRegExp" value="^(android|com|junit|net|org|java|javax)\."/>
+            <property name="customImportOrderRules" value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="ParenPad"/>