diff --git a/quality-checks/google_checks.xml b/quality-checks/google_checks.xml
index 925172dab..9fe031d90 100644
--- a/quality-checks/google_checks.xml
+++ b/quality-checks/google_checks.xml
@@ -163,9 +163,12 @@
     <module name="OverloadMethodsDeclarationOrder"/>
     <module name="VariableDeclarationUsageDistance"/>
     <module name="CustomImportOrder">
+      <property name="customImportOrderRules"
+                value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+      <property name="specialImportsRegExp" value="^javax\."/>
+      <property name="standardPackageRegExp" value="^java\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>
-      <property name="separateLineBetweenGroups" value="true"/>
-      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+      <property name="separateLineBetweenGroups" value="false"/>
     </module>
     <module name="MethodParamPad"/>
     <module name="ParenPad"/>