diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java
index 02d498ecd93..a0fd4579666 100644
--- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java
+++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java
@@ -21,7 +21,7 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
-import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.SettableNonNullObservableSupplier;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.chrome.R;
@@ -68,7 +68,7 @@ class BraveBookmarkManagerMediator extends BookmarkManagerMediator
             RecyclerView recyclerView,
             DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
             boolean isDialogUi,
-            ObservableSupplierImpl<Boolean> backPressStateSupplier,
+            SettableNonNullObservableSupplier<Boolean> backPressStateSupplier,
             Profile profile,
             BookmarkUndoController bookmarkUndoController,
             ModelList modelList,
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveFragmentDependencyProvider.java b/android/java/org/chromium/chrome/browser/settings/BraveFragmentDependencyProvider.java
index 2378b0a98d0..38863a0dda2 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveFragmentDependencyProvider.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveFragmentDependencyProvider.java
@@ -13,7 +13,6 @@ import androidx.fragment.app.FragmentManager;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.build.annotations.NullMarked;
-import org.chromium.build.annotations.Nullable;
 import org.chromium.chrome.browser.password_entry_edit.CredentialEditUiFactory;
 import org.chromium.chrome.browser.password_entry_edit.CredentialEntryFragmentViewBase;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -30,7 +29,7 @@ public class BraveFragmentDependencyProvider extends FragmentDependencyProvider
             Profile profile,
             OneshotSupplier<SnackbarManager> snackbarManagerSupplier,
             OneshotSupplier<BottomSheetController> bottomSheetControllerSupplier,
-            ObservableSupplier<@Nullable ModalDialogManager> modalDialogManagerSupplier) {
+            ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
         super(
                 context,
                 profile,
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index f76960f243a..6dc8a5e88d9 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -48,6 +48,7 @@ import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.OneshotSupplierImpl;
+import org.chromium.base.supplier.SettableNonNullObservableSupplier;
 import org.chromium.base.test.util.Batch;
 import org.chromium.chrome.browser.back_press.BackPressManager;
 import org.chromium.chrome.browser.bookmarks.BookmarkImageFetcher;
@@ -1920,7 +1921,7 @@ public class BytecodeTest {
                         RecyclerView.class,
                         DragReorderableRecyclerViewAdapter.class,
                         boolean.class,
-                        ObservableSupplierImpl.class,
+                        SettableNonNullObservableSupplier.class,
                         Profile.class,
                         BookmarkUndoController.class,
                         ModelList.class,
diff --git a/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java b/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java
index 46a15db5cc5..e2e5103509f 100644
--- a/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java
+++ b/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java
@@ -112,7 +112,9 @@ public class BraveHubManagerImpl extends HubManagerImpl {
     public void destroy() {
         super.destroy();
 
-        mActivity.unregisterComponentCallbacks(mComponentCallbacks);
+        if (mActivity != null) {
+            mActivity.unregisterComponentCallbacks(mComponentCallbacks);
+        }
     }
 
     private void maybeUpdateBottomMarginForContainerView() {
diff --git a/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java b/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java
index 3a4d3292466..8f66ee25d31 100644
--- a/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java
+++ b/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java
@@ -37,7 +37,7 @@ public class BravePasswordManagerHelper extends PasswordManagerHelper {
     public void showPasswordSettings(
             Context context,
             @ManagePasswordsReferrer int referrer,
-            Supplier<@Nullable ModalDialogManager> modalDialogManagerSupplier,
+            Supplier<ModalDialogManager> modalDialogManagerSupplier,
             boolean managePasskeys,
             @Nullable String account,
             SettingsCustomTabLauncher settingsCustomTabLauncher) {