diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
new file mode 100644
index 000000000..5d9a9d8b5
--- /dev/null
+++ b/.github/.OwlBot.yaml
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker:
+  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
diff --git a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
index 096f66b29..227603957 100644
--- a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
+++ b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
@@ -43,7 +43,6 @@
 import com.google.common.base.MoreObjects;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -69,7 +68,7 @@ public abstract class ExternalAccountCredentials extends GoogleCredentials {
   private static final long serialVersionUID = 8049126194174465023L;
 
   /** Base credential source class. Dictates the retrieval method of the external credential. */
-  abstract static class CredentialSource implements Serializable {
+  abstract static class CredentialSource implements java.io.Serializable {
 
     private static final long serialVersionUID = 8204657811562399944L;
 
@@ -641,7 +640,7 @@ private static boolean isValidUrl(String url) {
    * }
    * </pre>
    */
-  static final class ServiceAccountImpersonationOptions implements Serializable {
+  static final class ServiceAccountImpersonationOptions implements java.io.Serializable {
 
     private static final long serialVersionUID = 4250771921886280953L;
     private static final int DEFAULT_TOKEN_LIFETIME_SECONDS = 3600;
diff --git a/owlbot.py b/owlbot.py
index 8bf9d155d..610e82700 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -36,7 +36,6 @@
         ".kokoro/nightly/integration.cfg",
         ".kokoro/presubmit/integration.cfg",
         ".kokoro/presubmit/graalvm-native.cfg",
-        ".kokoro/presubmit/graalvm-native-17.cfg",
-        "oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java"
+        ".kokoro/presubmit/graalvm-native-17.cfg"
     ]
 )
diff --git a/pom.xml b/pom.xml
index 45fce5aa3..5a3f652ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,6 @@
           <version>2.13</version>
           <configuration>
             <verbose>true</verbose>
-            <skipSortingImports>true</skipSortingImports>
           </configuration>
         </plugin>
         <plugin>