diff --git a/checkstyle.xml b/checkstyle.xml
index fffe1dc92..76ee8e4b8 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -52,16 +52,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <property name="severity" value="error"/>
     </module>
 
-    <module name="ImportOrder">
-      <!-- Checks for out of order import statements. -->
-
-      <property name="severity" value="warning"/>
-      <property name="groups" value="com.google,android,junit,net,org,java,javax"/>
-      <!-- This ensures that static imports go first. -->
-      <property name="option" value="top"/>
-      <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
-    </module>
-
     <!--
 
     JAVADOC CHECKS
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
index 0a640a811..95022b48e 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
@@ -91,5 +91,7 @@ public ParsedAppId parseFullAppId(String fullAppId) {
   }
 
   @Override
-  public String getDefaultGcsBucketName() { return null; }
+  public String getDefaultGcsBucketName() {
+    return null;
+  }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
index b42558b9d..e2e7d0c9e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
@@ -41,7 +41,7 @@
  */
 @Beta
 public class MockTokenServerTransport extends MockHttpTransport {
-  /** Old URL of Google's token server (for backwards compatibility) */
+  /** Old URL of Google's token server (for backwards compatibility). */
   private static final String LEGACY_TOKEN_SERVER_URL =
       "https://accounts.google.com/o/oauth2/token";