diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 762c7cba5..448ba3eba 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -560,10 +560,10 @@ private CordovaPlugin instantiatePlugin(String className) {
         CordovaPlugin ret = null;
         try {
             Class<?> c = null;
-            if ((className != null) && !("".equals(className))) {
+            if (className != null && !className.isBlank()) {
                 c = Class.forName(className);
             }
-            if (c != null & CordovaPlugin.class.isAssignableFrom(c)) {
+            if (c != null && CordovaPlugin.class.isAssignableFrom(c)) {
                 ret = (CordovaPlugin) c.getDeclaredConstructor().newInstance();
             }
         } catch (Exception e) {
diff --git a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
index c10c666d7..a77d1bb8f 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -231,7 +231,7 @@ public boolean onShowFileChooser(WebView webView, final ValueCallback<Uri[]> fil
         Intent fileIntent = fileChooserParams.createIntent();
 
         // Check if multiple-select is specified
-        Boolean selectMultiple = false;
+        boolean selectMultiple = false;
         if (fileChooserParams.getMode() == WebChromeClient.FileChooserParams.MODE_OPEN_MULTIPLE) {
             selectMultiple = true;
         }
diff --git a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
index c79ead6c5..f20dcc3a6 100644
--- a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
+++ b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
@@ -71,6 +71,7 @@ public void iFrameHistory() throws Throwable {
         onWebView().withElement(findElement(Locator.ID, "google_maps")).perform(webClick());
         sleep(WEBVIEW_LOAD_DELAY);
         mActivityRule.runOnUiThread(new Runnable() {
+            @Override
             public void run()
             {
                 String url = cordovaWebView.getUrl();
@@ -80,6 +81,7 @@ public void run()
         sleep(WEBVIEW_LOAD_DELAY);
         onWebView().withElement(findElement(Locator.ID, "javascript_load")).perform(webClick());
         mActivityRule.runOnUiThread(new Runnable() {
+            @Override
             public void run()
             {
                 String url = cordovaWebView.getUrl();
@@ -90,6 +92,7 @@ public void run()
         //Espresso will kill the application and not trigger the backHistory method, which correctly
         //navigates the iFrame history.  backHistory is tied to the back button.
         mActivityRule.runOnUiThread(new Runnable() {
+            @Override
             public void run()
             {
                 assertTrue(cordovaWebView.backHistory());