BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

32 files changed, 724 insertions, 233 deletions

diff --git a/chromium/chrome/android/features/android_library_factory_tmpl.gni b/chromium/chrome/android/features/android_library_factory_tmpl.gni
index cad5d206916..75a36b64d29 100644
--- a/chromium/chrome/android/features/android_library_factory_tmpl.gni
+++ b/chromium/chrome/android/features/android_library_factory_tmpl.gni
@@ -75,9 +75,8 @@ template("android_library_factory") {
   action_foreach_with_pydeps(_process_factory_target_name) {
     script = "//chrome/android/features/create_stripped_java_factory.py"
     sources = invoker.sources
-    outputs = [
-      "$_base_gen_dir/{{source_root_relative_dir}}/{{source_file_part}}",
-    ]
+    outputs =
+        [ "$_base_gen_dir/{{source_root_relative_dir}}/{{source_file_part}}" ]
     args = [
       "--output",
       rebase_path(outputs[0], root_build_dir),
@@ -86,13 +85,11 @@ template("android_library_factory") {
   }
 
   android_library(target_name) {
-    deps = [
-      ":$_process_factory_target_name",
-    ]
+    deps = [ ":$_process_factory_target_name" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-    java_files = get_target_outputs(":$_process_factory_target_name")
+    sources = get_target_outputs(":$_process_factory_target_name")
     jar_excluded_patterns = [ "*" ]
   }
 }
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index ffbbcfc3f28..45ce1b39b9c 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -18,12 +18,12 @@ android_library("animated_poodle_java") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
   ]
 
-  java_files = [ "java/src/org/chromium/chrome/browser/" +
-                 "autofill_assistant/header/AnimatedPoodle.java" ]
+  sources = [ "java/src/org/chromium/chrome/browser/" +
+              "autofill_assistant/header/AnimatedPoodle.java" ]
 }
 
 android_resources("animated_poodle_resources") {
-  resource_dirs = [ "java/res_poodle" ]
+  sources = [ "java/res_poodle/drawable/ic_autofill_assistant_24dp.xml" ]
   custom_package = "org.chromium.chrome.autofill_assistant.poodle"
 }
 
@@ -33,29 +33,30 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
-    "//chrome/android:chrome_public_java",
-    "//chrome/android/public/profiles:java",
     "//chrome/browser/image_fetcher:java",
-    "//chrome/browser/ui/android/widget:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
+    "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/widget/android:java",
     "//components/policy/android:policy_java",
     "//components/signin/core/browser/android:java",
-    "//components/signin/public/identity_manager/android:java",
+    "//components/signin/public/android:java",
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_collections_java",
-    "//third_party/android_deps:com_android_support_coordinatorlayout_java",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_gridlayout_v7_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_deps:com_android_support_support_core_ui_java",
-    "//third_party/android_deps:com_android_support_support_core_utils_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
+    "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_java",
   ]
@@ -66,15 +67,15 @@ android_library("java") {
     deps += [ ":animated_poodle_java" ]
   }
 
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/autofill_assistant/AbstractListObserver.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomSheetContent.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantKeyboardCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantKeyboardCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPeekHeightCoordinator.java",
@@ -82,23 +83,21 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbar.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTagsForTesting.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTextUtils.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandlerImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantModuleEntryImpl.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandlerImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantServiceInjector.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetUtils.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/EditDistance.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/FeedbackContext.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/SizeListenableLinearLayout.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsDecoration.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantCarouselCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantCarouselModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChip.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipAdapter.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipViewHolder.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantSuggestionsCarouselCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsCoordinator.java",
@@ -111,12 +110,20 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormInput.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormSelectionInput.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormSelectionChoice.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormSelectionInput.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDimension.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiViewBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantToggleButton.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantValue.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewEvents.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AnimatedProgressBar.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
@@ -128,24 +135,25 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxViewBinder.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayEventFilter.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayImage.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantContactDetailsSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantContactDetailsSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateChoiceOptions.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantShippingAddressSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantTermsSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpander.java",
@@ -153,6 +161,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionContainer.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantPopupListSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantStaticTextSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java",
   ]
@@ -175,7 +184,12 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantColor.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDimension.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantDrawable.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantGenericUiModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantValue.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewEvents.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBox.java",
@@ -184,20 +198,19 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java",
   ]
 }
 
 generate_jni("test_support_jni_headers") {
   testonly = true
-  sources = [
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java",
-  ]
+  sources = [ "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java" ]
 }
 
 android_library("autofill_assistant_java_test_support") {
   testonly = true
 
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantService.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestScript.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java",
@@ -208,7 +221,8 @@ android_library("autofill_assistant_java_test_support") {
     ":test_support_jni_headers",
     "//base:jni_java",
     "//components/autofill_assistant/browser:proto_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
@@ -216,27 +230,29 @@ android_library("autofill_assistant_java_test_support") {
 android_library("test_java") {
   testonly = true
 
-  java_files = [
+  sources = [
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionsCarouselUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantAutostartTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantBottomsheetTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantChromeTabIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDetailsUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionHandlerTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFormActionTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataUiTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPasswordManagerIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPersonalDataManagerTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/TestingAutofillAssistantModuleEntryProvider.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/EditDistanceTest.java",
   ]
 
   deps = [
@@ -247,18 +263,19 @@ android_library("test_java") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
-    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library:feed_lib_java",
     "//chrome/browser/image_fetcher:java",
-    "//chrome/browser/ui/android/widget:java",
+    "//chrome/browser/password_manager/android_test_helpers:test_support_java",
+    "//chrome/browser/preferences:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
+    "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:com_android_support_coordinatorlayout_java",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
+    "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
+    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/espresso:espresso_all_java",
     "//third_party/hamcrest:hamcrest_java",
@@ -267,13 +284,58 @@ android_library("test_java") {
     "//ui/android:ui_full_java",
   ]
 
-  data = [
-    "//components/test/data/autofill_assistant/",
-  ]
+  data = [ "//components/test/data/autofill_assistant/" ]
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [
+    "java/res/drawable/autofill_assistant_actions_gradient.xml",
+    "java/res/drawable/autofill_assistant_default_details.xml",
+    "java/res/drawable/autofill_assistant_details_bg.xml",
+    "java/res/drawable/autofill_assistant_lightblue_rect_bg.xml",
+    "java/res/drawable/autofill_assistant_swipe_indicator.xml",
+    "java/res/drawable/ic_add_outline_white_24dp.xml",
+    "java/res/drawable/ic_autofill_assistant_add_circle_24dp.xml",
+    "java/res/drawable/ic_clear_black_24dp.xml",
+    "java/res/drawable/ic_done_black_24dp.xml",
+    "java/res/drawable/ic_logo_assistant_24dp.xml",
+    "java/res/drawable/ic_refresh_black_24dp.xml",
+    "java/res/drawable/ic_remove_outline_white_24dp.xml",
+    "java/res/layout/autofill_assistant_address_full.xml",
+    "java/res/layout/autofill_assistant_address_summary.xml",
+    "java/res/layout/autofill_assistant_bottom_sheet_content.xml",
+    "java/res/layout/autofill_assistant_bottom_sheet_toolbar.xml",
+    "java/res/layout/autofill_assistant_button_assistive.xml",
+    "java/res/layout/autofill_assistant_button_filled.xml",
+    "java/res/layout/autofill_assistant_button_hairline.xml",
+    "java/res/layout/autofill_assistant_contact_full.xml",
+    "java/res/layout/autofill_assistant_contact_summary.xml",
+    "java/res/layout/autofill_assistant_datetime.xml",
+    "java/res/layout/autofill_assistant_details.xml",
+    "java/res/layout/autofill_assistant_form_checkbox.xml",
+    "java/res/layout/autofill_assistant_form_counter.xml",
+    "java/res/layout/autofill_assistant_form_counter_input.xml",
+    "java/res/layout/autofill_assistant_form_information.xml",
+    "java/res/layout/autofill_assistant_form_radiobutton.xml",
+    "java/res/layout/autofill_assistant_form_selection_input.xml",
+    "java/res/layout/autofill_assistant_header.xml",
+    "java/res/layout/autofill_assistant_info_box.xml",
+    "java/res/layout/autofill_assistant_login.xml",
+    "java/res/layout/autofill_assistant_onboarding.xml",
+    "java/res/layout/autofill_assistant_payment_method_full.xml",
+    "java/res/layout/autofill_assistant_payment_method_summary.xml",
+    "java/res/layout/autofill_assistant_payment_request_section_divider.xml",
+    "java/res/layout/autofill_assistant_payment_request_section_title.xml",
+    "java/res/layout/autofill_assistant_payment_request_terms_and_conditions.xml",
+    "java/res/layout/autofill_assistant_popup_list_section.xml",
+    "java/res/layout/autofill_assistant_static_text_section.xml",
+    "java/res/menu/profile_icon_menu.xml",
+    "java/res/values-night-v17/colors.xml",
+    "java/res/values-v17/attrs.xml",
+    "java/res/values-v17/colors.xml",
+    "java/res/values-v17/dimens.xml",
+    "java/res/values-v17/styles.xml",
+  ]
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
index bd29fae1943..163cbcedf76 100644
--- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
+++ b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for VR DFM of Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_chrome_autofill_assistant_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_autofill_assistant_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_chrome_autofill_assistant_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_chrome_autofill_assistant_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_chrome_autofill_assistant_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_chrome_autofill_assistant_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_chrome_autofill_assistant_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_chrome_autofill_assistant_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_chrome_autofill_assistant_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_chrome_autofill_assistant_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_chrome_autofill_assistant_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_chrome_autofill_assistant_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_chrome_autofill_assistant_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_chrome_autofill_assistant_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_chrome_autofill_assistant_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_chrome_autofill_assistant_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_chrome_autofill_assistant_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_chrome_autofill_assistant_strings.xml" lang="fi" type="android" />
-    <output filename="values-gu/android_chrome_autofill_assistant_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_chrome_autofill_assistant_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_chrome_autofill_assistant_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_chrome_autofill_assistant_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_chrome_autofill_assistant_strings.xml" lang="gl" type="android" />
+    <output filename="values-gu/android_chrome_autofill_assistant_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_chrome_autofill_assistant_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_chrome_autofill_assistant_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_chrome_autofill_assistant_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_chrome_autofill_assistant_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_chrome_autofill_assistant_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_chrome_autofill_assistant_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_chrome_autofill_assistant_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_chrome_autofill_assistant_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_chrome_autofill_assistant_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_chrome_autofill_assistant_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_chrome_autofill_assistant_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_chrome_autofill_assistant_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_chrome_autofill_assistant_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_chrome_autofill_assistant_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_chrome_autofill_assistant_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_chrome_autofill_assistant_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_chrome_autofill_assistant_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_chrome_autofill_assistant_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_chrome_autofill_assistant_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_chrome_autofill_assistant_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_chrome_autofill_assistant_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_chrome_autofill_assistant_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_chrome_autofill_assistant_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_chrome_autofill_assistant_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_chrome_autofill_assistant_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_chrome_autofill_assistant_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_chrome_autofill_assistant_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_chrome_autofill_assistant_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_chrome_autofill_assistant_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_chrome_autofill_assistant_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_chrome_autofill_assistant_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_chrome_autofill_assistant_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_chrome_autofill_assistant_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_chrome_autofill_assistant_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_chrome_autofill_assistant_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_chrome_autofill_assistant_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_chrome_autofill_assistant_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_chrome_autofill_assistant_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_autofill_assistant_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_chrome_autofill_assistant_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_autofill_assistant_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_chrome_autofill_assistant_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_chrome_autofill_assistant_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_chrome_autofill_assistant_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_chrome_autofill_assistant_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_chrome_autofill_assistant_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_autofill_assistant_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_autofill_assistant_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_chrome_autofill_assistant_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_autofill_assistant_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_chrome_autofill_assistant_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_chrome_autofill_assistant_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_chrome_autofill_assistant_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_autofill_assistant_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_autofill_assistant_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_autofill_assistant_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_autofill_assistant_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_autofill_assistant_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_autofill_assistant_strings_ta.xtb" />
@@ -140,13 +168,25 @@
   <release allow_pseudo="false" seq="1">
     <messages fallback_to_english="true">
       <message name="IDS_INIT_OK" desc="Init screen confirmation text.">
-        I accept
+        I agree
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_TITLE" desc="The title of the onboarding screen.">
+        Try Google Assistant \n in Chrome
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_RENT_CAR" desc="Onboarding message describing autofill assistant's capability for car rentals.">
+        Rent a car \n in just a few taps
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_BUY_MOVIE_TICKETS" desc="Onboarding message describing autofill assistant's capability for movie tickets.">
+        Buy movie tickets \n in just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE" desc="Onboarding message describing autofill assistant's capability.">
-        Google Assistant saves you time by helping you check out on the web
+        Google Assistant saves you time by helping you complete actions on the web, like search and checkout.
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_SHORT" desc="Short onboarding message describing autofill assistant's capability.">
+        Google Assistant in Chrome can complete actions across websites for you
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_DESCRIPTION" desc="Message linking to the Google terms and conditions for Google Assistant in Chrome.">
-        Chrome will send the site’s URL and content as well as your email and credit card type saved in Chrome to Google. You can turn this off in Chrome settings. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn&#xA0;more<ph name="END_LINK">&lt;/link&gt;</ph>
+        To help you complete tasks, Google will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Google account. You can turn off Assistant in Chrome settings. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn&#xA0;more<ph name="END_LINK">&lt;/link&gt;</ph>
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_URL" desc="URL for Google Autofill Assistant Terms of Service" translateable="false">
         http://support.google.com/assistant?p=fast_checkout
diff --git a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
index 1e54c22072f..111a575237e 100644
--- a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
+++ b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 
 public_autofill_assistant_java_sources = [
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandler.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantArguments.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectAction.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionHandler.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFacade.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantMetrics.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantModuleEntry.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantModuleEntryProvider.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java",
-  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionHandler.java",
-  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectAction.java",
-  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandler.java",
-  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/GetCurrentTab.java",
 ]
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
new file mode 100644
index 00000000000..414c852d226
--- /dev/null
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//chrome/android/features/cablev2_authenticator/config.gni")
+
+java_group("public_java") {
+  deps = [ "factory:public_java" ]
+}
+
+# Only chrome_all_java and test targets should depend on this internal target.
+java_group("internal_java") {
+  deps = [ "factory:internal_java" ]
+
+  if (enable_android_cablev2_authenticator) {
+    deps += [ "internal:internal_java" ]
+  }
+}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/config.gni b/chromium/chrome/android/features/cablev2_authenticator/config.gni
new file mode 100644
index 00000000000..3e91dd816aa
--- /dev/null
+++ b/chromium/chrome/android/features/cablev2_authenticator/config.gni
@@ -0,0 +1,9 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/channel.gni")
+
+declare_args() {
+  enable_android_cablev2_authenticator = false
+}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn
new file mode 100644
index 00000000000..5a3e5b8ab02
--- /dev/null
+++ b/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//chrome/android/features/android_library_factory_tmpl.gni")
+import("//chrome/android/features/cablev2_authenticator/config.gni")
+
+if (enable_android_cablev2_authenticator) {
+  _factory_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUIFactory.java" ]
+} else {
+  _factory_sources = [ "dummy/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUIFactory.java" ]
+}
+
+android_library_factory("public_java") {
+  sources = _factory_sources
+}
+
+android_library("internal_java") {
+  deps = [
+    "//chrome/android/features/cablev2_authenticator/internal:internal_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+  ]
+  sources = _factory_sources
+}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn
new file mode 100644
index 00000000000..255cad0f7b7
--- /dev/null
+++ b/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn
@@ -0,0 +1,64 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//chrome/android/features/cablev2_authenticator/config.gni")
+
+if (enable_android_cablev2_authenticator) {
+  android_library("internal_java") {
+    sources = [
+      "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java",
+      "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticator.java",
+      "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java",
+      "java/src/org/chromium/chrome/browser/webauth/authenticator/CameraView.java",
+      "java/src/org/chromium/chrome/browser/webauth/authenticator/QRScanDialog.java",
+    ]
+
+    deps = [
+      "$google_play_services_package:google_play_services_base_java",
+      "$google_play_services_package:google_play_services_fido_java",
+      "$google_play_services_package:google_play_services_tasks_java",
+      "$google_play_services_package:google_play_services_vision_common_java",
+      "$google_play_services_package:google_play_services_vision_java",
+      "//base:base_java",
+      "//base:jni_java",
+      "//chrome/android:chrome_java",
+      "//content/public/android:content_java",
+      "//third_party/android_deps:android_support_v7_appcompat_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//ui/android:ui_full_java",
+    ]
+
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  }
+} else {
+  java_group("internal_java") {
+    deps = [
+      # This is needed to prevent a build-error. See comment in
+      # https://chromium-review.googlesource.com/c/chromium/src/+/2079613/12/chrome/android/features/cablev2_authenticator/internal/BUILD.gn#9
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+    ]
+  }
+}
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java" ]
+}
+
+# Native code cannot change between different release channels and so this is
+# always enabled.
+source_set("native") {
+  sources = [ "native/cablev2_authenticator_android.cc" ]
+
+  deps = [
+    ":jni_headers",
+    "//base",
+    "//components/cbor",
+    "//components/device_event_log",
+    "//content/public/browser",
+    "//crypto",
+    "//device/fido",
+    "//third_party/boringssl",
+  ]
+}
diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn
index c81ba708948..2edf36e8118 100644
--- a/chromium/chrome/android/features/dev_ui/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/BUILD.gn
@@ -18,5 +18,6 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android/features/dev_ui/public:java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
+  sources =
+      [ "internal/java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
 }
diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
index d9c45db04ff..8c098e78143 100644
--- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
+++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
@@ -11,7 +11,12 @@ declare_args() {
 dev_ui_module_desc = {
   name = "dev_ui"
   java_deps = [ "//chrome/android/features/dev_ui:java" ]
-  android_manifest = "//chrome/android/features/dev_ui/java/AndroidManifest.xml"
+  android_manifest =
+      "//chrome/android/features/dev_ui/internal/java/AndroidManifest.xml"
   paks = [ "$root_gen_dir/chrome/dev_ui_resources.pak" ]
   pak_deps = [ "//chrome/browser/resources:dev_ui_paks" ]
+
+  # DevUI DFM does not need to call Module.getImpl(), and manages loading on
+  # install and on use. Therefore disable auto-load on Module.getImpl().
+  load_native_on_get_impl = false
 }
diff --git a/chromium/chrome/android/features/dev_ui/public/BUILD.gn b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
index ce724fc45e3..779293eb7ec 100644
--- a/chromium/chrome/android/features/dev_ui/public/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
@@ -10,7 +10,7 @@ android_library("java") {
     "//components/module_installer/android:module_installer_java",
     "//components/module_installer/android:module_interface_java",
   ]
-  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUi.java" ]
+  sources = [ "java/src/org/chromium/chrome/features/dev_ui/DevUi.java" ]
 
   # Need this to generate DevUiModule.java.
   annotation_processor_deps =
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index bd389b8ce6f..062b52006e0 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -30,24 +30,24 @@ generate_jni("jni_headers") {
 android_library("test_java") {
   testonly = true
 
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingUiCaptureTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetViewTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessoryIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessoryIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessoryIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewTest.java",
-    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabViewTest.java",
+    "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewTest.java",
     "javatests/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabTestHelper.java",
   ]
@@ -60,21 +60,26 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
-    "//chrome/android/public/profiles:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
     "//components/autofill/core/common/mojom:mojo_types_java",
+    "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/widget/android:java",
     "//components/feature_engagement/public:public_java",
+    "//components/infobars/core:infobar_enums_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
+    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/espresso:espresso_all_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//ui/android:ui_full_java",
+    "//ui/android:ui_java_test_support",
     "//ui/android:ui_utils_java",
   ]
 }
@@ -82,10 +87,10 @@ android_library("test_java") {
 junit_binary("keyboard_accessory_junit_tests") {
   testonly = true
 
-  java_files = [
-    "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetControllerTest.java",
+  sources = [
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryControllerTest.java",
+    "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetControllerTest.java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
index f92b7d0a296..c1d9b0964c4 100644
--- a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn
@@ -8,15 +8,12 @@ import("//chrome/android/features/android_library_factory_tmpl.gni")
 _factory_sources = [ "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentFactory.java" ]
 
 android_library_factory("public_java") {
-  deps = [
-    "//chrome/android/features/keyboard_accessory/public:public_java",
-  ]
+  deps = [ "//chrome/android/features/keyboard_accessory/public:public_java" ]
   sources = _factory_sources
 }
 
 android_library("internal_java") {
-  deps = [
-    "//chrome/android/features/keyboard_accessory/internal:internal_java",
-  ]
-  java_files = _factory_sources
+  deps =
+      [ "//chrome/android/features/keyboard_accessory/internal:internal_java" ]
+  sources = _factory_sources
 }
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index d2378ec2c75..82919c4d719 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -14,24 +14,25 @@ android_library("internal_java") {
 
     # TODO(crbug/951695): Cyclic dependency. Depend on public only when ready.
     "//chrome/android:chrome_java",
-    "//chrome/android:chrome_public_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
-    "//chrome/android/public/profiles:java",
-    "//chrome/browser/ui/android/widget:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
+    "//components/browser_ui/widget/android:java",
+    "//components/embedder_support/android:util_java",
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//third_party/android_deps:com_android_support_viewpager_java",
+    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_viewpager_viewpager_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//ui/android:ui_java",
     "//ui/android:ui_utils_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryViewBridge.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/KeyboardExtensionViewResizer.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentBridge.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java",
@@ -40,10 +41,10 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingState.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingStateCache.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryCoordinator.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryMediator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryMetricsRecorder.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryProperties.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryRecyclerViewMcp.java",
@@ -85,7 +86,32 @@ android_library("internal_java") {
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [
+    "java/res/drawable/autofill_chip_inset.xml",
+    "java/res/layout/address_accessory_sheet.xml",
+    "java/res/layout/credit_card_accessory_sheet.xml",
+    "java/res/layout/keyboard_accessory.xml",
+    "java/res/layout/keyboard_accessory_action.xml",
+    "java/res/layout/keyboard_accessory_action_modern.xml",
+    "java/res/layout/keyboard_accessory_chip.xml",
+    "java/res/layout/keyboard_accessory_modern.xml",
+    "java/res/layout/keyboard_accessory_sheet.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_address_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_credit_card_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_legacy_password_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_legacy_title.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_password_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_title.xml",
+    "java/res/layout/keyboard_accessory_suggestion.xml",
+    "java/res/layout/keyboard_accessory_tabs.xml",
+    "java/res/layout/password_accessory_sheet.xml",
+    "java/res/layout/password_accessory_sheet_label.xml",
+    "java/res/layout/password_accessory_sheet_legacy_option.xml",
+    "java/res/layout/password_accessory_sheet_option.xml",
+    "java/res/values/dimens.xml",
+    "java/res/values/styles.xml",
+  ]
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index 95d7ce37d3c..c7814076c38 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for the keyboard accessory in Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_keyboard_accessory_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_keyboard_accessory_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_keyboard_accessory_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_keyboard_accessory_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_keyboard_accessory_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_keyboard_accessory_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_keyboard_accessory_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_keyboard_accessory_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_keyboard_accessory_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_keyboard_accessory_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_keyboard_accessory_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_keyboard_accessory_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_keyboard_accessory_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_keyboard_accessory_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_keyboard_accessory_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_keyboard_accessory_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_keyboard_accessory_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_keyboard_accessory_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_keyboard_accessory_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_keyboard_accessory_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_keyboard_accessory_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_keyboard_accessory_strings.xml" lang="gl" type="android" />
     <output filename="values-gu/android_keyboard_accessory_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_keyboard_accessory_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_keyboard_accessory_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_keyboard_accessory_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_keyboard_accessory_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_keyboard_accessory_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_keyboard_accessory_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_keyboard_accessory_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_keyboard_accessory_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_keyboard_accessory_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_keyboard_accessory_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_keyboard_accessory_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_keyboard_accessory_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_keyboard_accessory_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_keyboard_accessory_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_keyboard_accessory_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_keyboard_accessory_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_keyboard_accessory_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_keyboard_accessory_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_keyboard_accessory_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_keyboard_accessory_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_keyboard_accessory_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_keyboard_accessory_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_keyboard_accessory_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_keyboard_accessory_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_keyboard_accessory_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_keyboard_accessory_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_keyboard_accessory_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_keyboard_accessory_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_keyboard_accessory_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_keyboard_accessory_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_keyboard_accessory_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_keyboard_accessory_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_keyboard_accessory_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_keyboard_accessory_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_keyboard_accessory_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_keyboard_accessory_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_keyboard_accessory_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_keyboard_accessory_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_keyboard_accessory_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_keyboard_accessory_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_keyboard_accessory_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_keyboard_accessory_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_keyboard_accessory_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_keyboard_accessory_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_keyboard_accessory_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_keyboard_accessory_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_keyboard_accessory_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_keyboard_accessory_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_keyboard_accessory_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_keyboard_accessory_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_keyboard_accessory_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_keyboard_accessory_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_keyboard_accessory_strings_sl.xtb" />
     <file lang="sq" path="translations/android_keyboard_accessory_strings_sq.xtb" />
     <file lang="sr" path="translations/android_keyboard_accessory_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_keyboard_accessory_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_keyboard_accessory_strings_sv.xtb" />
     <file lang="sw" path="translations/android_keyboard_accessory_strings_sw.xtb" />
     <file lang="ta" path="translations/android_keyboard_accessory_strings_ta.xtb" />
diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
index 59e631945fa..839d0492a89 100644
--- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -7,15 +7,14 @@ import("//build/config/android/rules.gni")
 android_library("public_java") {
   deps = [
     "//base:base_java",
-    "//chrome/android:chrome_public_java",
     "//components/autofill/android:autofill_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/KeyboardAccessoryData.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/data/Provider.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/PropertyProvider.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/data/Provider.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/UserInfoField.java",
   ]
   srcjar_deps = [ ":java_enums_srcjar" ]
diff --git a/chromium/chrome/android/features/media_router/BUILD.gn b/chromium/chrome/android/features/media_router/BUILD.gn
index 5be123b4d33..8b99219dae3 100644
--- a/chromium/chrome/android/features/media_router/BUILD.gn
+++ b/chromium/chrome/android/features/media_router/BUILD.gn
@@ -19,12 +19,12 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//services/media_session/public/cpp/android:media_session_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_collections_java",
-    "//third_party/android_deps:com_android_support_mediarouter_v7_java",
-    "//third_party/android_deps:com_android_support_support_compat_java",
+    "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
     "//third_party/android_media:android_media_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java",
     "java/src/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java",
     "java/src/org/chromium/chrome/browser/media/router/CastSessionUtil.java",
@@ -81,7 +81,7 @@ generate_jni("jni_headers") {
 android_library("test_java") {
   testonly = true
 
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java",
   ]
@@ -102,7 +102,7 @@ android_library("test_java") {
 }
 
 junit_binary("media_router_junit_tests") {
-  java_files = [
+  sources = [
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java",
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java",
     "junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java",
@@ -128,7 +128,30 @@ junit_binary("media_router_junit_tests") {
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [
+    "java/res/drawable-hdpi/cast_playing_square.png",
+    "java/res/drawable-hdpi/ic_cast_dark_off.png",
+    "java/res/drawable-hdpi/ic_cast_dark_on.png",
+    "java/res/drawable-hdpi/ic_notification_media_route.png",
+    "java/res/drawable-mdpi/cast_playing_square.png",
+    "java/res/drawable-mdpi/ic_cast_dark_off.png",
+    "java/res/drawable-mdpi/ic_cast_dark_on.png",
+    "java/res/drawable-mdpi/ic_notification_media_route.png",
+    "java/res/drawable-xhdpi/cast_playing_square.png",
+    "java/res/drawable-xhdpi/ic_cast_dark_off.png",
+    "java/res/drawable-xhdpi/ic_cast_dark_on.png",
+    "java/res/drawable-xhdpi/ic_notification_media_route.png",
+    "java/res/drawable-xxhdpi/cast_playing_square.png",
+    "java/res/drawable-xxhdpi/ic_cast_dark_off.png",
+    "java/res/drawable-xxhdpi/ic_cast_dark_on.png",
+    "java/res/drawable-xxhdpi/ic_notification_media_route.png",
+    "java/res/drawable-xxxhdpi/cast_playing_square.png",
+    "java/res/drawable-xxxhdpi/ic_notification_media_route.png",
+    "java/res/drawable/ic_cast_dark_chrome.xml",
+    "java/res/layout/caf_controller_media_route_button.xml",
+    "java/res/layout/expanded_cast_controller.xml",
+    "java/res/values-v17/styles.xml",
+  ]
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
diff --git a/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd b/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
index 3c42b13f383..65cc7bfe5c1 100644
--- a/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
+++ b/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for VR DFM of Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_chrome_media_router_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_media_router_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_chrome_media_router_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_chrome_media_router_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_chrome_media_router_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_chrome_media_router_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_chrome_media_router_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_chrome_media_router_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_chrome_media_router_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_chrome_media_router_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_chrome_media_router_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_chrome_media_router_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_chrome_media_router_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_chrome_media_router_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_chrome_media_router_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_chrome_media_router_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_chrome_media_router_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_chrome_media_router_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_chrome_media_router_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_chrome_media_router_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_chrome_media_router_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_chrome_media_router_strings.xml" lang="gl" type="android" />
     <output filename="values-gu/android_chrome_media_router_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_chrome_media_router_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_chrome_media_router_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_chrome_media_router_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_chrome_media_router_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_chrome_media_router_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_chrome_media_router_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_chrome_media_router_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_chrome_media_router_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_chrome_media_router_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_chrome_media_router_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_chrome_media_router_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_chrome_media_router_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_chrome_media_router_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_chrome_media_router_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_chrome_media_router_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_chrome_media_router_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_chrome_media_router_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_chrome_media_router_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_chrome_media_router_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_chrome_media_router_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_chrome_media_router_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_chrome_media_router_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_chrome_media_router_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_chrome_media_router_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_chrome_media_router_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_chrome_media_router_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_chrome_media_router_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_chrome_media_router_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_chrome_media_router_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_chrome_media_router_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_chrome_media_router_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_chrome_media_router_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_chrome_media_router_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_chrome_media_router_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_chrome_media_router_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_chrome_media_router_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_chrome_media_router_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_chrome_media_router_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_media_router_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_chrome_media_router_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_media_router_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_chrome_media_router_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_chrome_media_router_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_chrome_media_router_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_chrome_media_router_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_chrome_media_router_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_media_router_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_media_router_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_chrome_media_router_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_media_router_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_chrome_media_router_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_chrome_media_router_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_chrome_media_router_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_media_router_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_media_router_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_media_router_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_media_router_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_media_router_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_media_router_strings_ta.xtb" />
diff --git a/chromium/chrome/android/features/stack_unwinder/internal/BUILD.gn b/chromium/chrome/android/features/stack_unwinder/internal/BUILD.gn
deleted file mode 100644
index 66f45ada31b..00000000000
--- a/chromium/chrome/android/features/stack_unwinder/internal/BUILD.gn
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/buildflag_header.gni")
-import("//build/config/android/rules.gni")
-import("//chrome/android/modules/buildflags.gni")
-
-android_library("java") {
-  deps = [
-    "//base:base_java",
-    "//chrome/android/features/stack_unwinder/public:java",
-  ]
-  java_files = [ "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinderImpl.java" ]
-
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  deps += [ "//base:jni_java" ]
-}
-
-source_set("native") {
-  sources = [
-    "stack_unwinder_impl.cc",
-  ]
-
-  deps = [
-    ":jni_headers",
-    "//base",
-    "//ui/base",
-  ]
-}
-
-generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinderImpl.java",
-  ]
-}
diff --git a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
index bde4cef31c0..5710847a845 100644
--- a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
+++ b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn
@@ -1,11 +1,7 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/android/rules.gni")
-
-android_library("java") {
-  java_files = [
-    "java/src/org/chromium/chrome/features/stack_unwinder/StackUnwinder.java",
-  ]
+source_set("memory_regions_map") {
+  public = [ "memory_regions_map.h" ]
 }
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index 69b5213bba8..4631becd4f6 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -16,9 +16,25 @@ java_strings_grd("java_strings_grd") {
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [
+    "java/res/drawable-hdpi/ic_explore.png",
+    "java/res/drawable-hdpi/ic_home.png",
+    "java/res/drawable-mdpi/ic_explore.png",
+    "java/res/drawable-mdpi/ic_home.png",
+    "java/res/drawable-xhdpi/ic_explore.png",
+    "java/res/drawable-xhdpi/ic_home.png",
+    "java/res/drawable-xxhdpi/ic_explore.png",
+    "java/res/drawable-xxhdpi/ic_home.png",
+    "java/res/drawable-xxxhdpi/ic_explore.png",
+    "java/res/drawable-xxxhdpi/ic_home.png",
+    "java/res/layout/ss_bottom_bar_layout.xml",
+    "java/res/layout/ss_explore_button.xml",
+    "java/res/layout/ss_home_button.xml",
+    "java/res/values/dimens.xml",
+    "java/res/values/ids.xml",
+  ]
   if (enable_feed_in_chrome) {
-    resource_dirs += [ "java/explore_res" ]
+    sources += [ "java/explore_res/layout/ss_feed_header.xml" ]
   }
   deps = [
     ":java_strings_grd",
@@ -28,17 +44,17 @@ android_resources("java_resources") {
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/start_surface/BottomBarCoordinator.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarView.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
+    "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceDelegate.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
-    "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
   ]
 
@@ -47,16 +63,17 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android:chrome_java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
-    "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/util:java",
+    "//chrome/browser/ui/messages/android:java",
+    "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_design_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//ui/android:ui_full_java",
   ]
 
   if (enable_feed_in_chrome) {
-    java_files += [
+    sources += [
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceActionHandler.java",
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
       "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
@@ -65,14 +82,14 @@ android_library("java") {
     ]
 
     deps += [
-      "//chrome/android/public/profiles:java",
+      "//chrome/browser/profiles/android:java",
       "//content/public/android:content_java",
       "//third_party/android_sdk/androidx_browser:androidx_browser_java",
       "//ui/android:ui_utils_java",
       "//ui/base/mojom:mojom_java",
     ]
   } else {
-    java_files += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ]
+    sources += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ]
   }
 
   if (!is_java_debug) {
diff --git a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd b/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
index 0dcfcbb01f3..e05f88b286b 100644
--- a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
+++ b/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for Start Surface DFM of Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_chrome_start_surface_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_start_surface_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_chrome_start_surface_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_chrome_start_surface_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_chrome_start_surface_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_chrome_start_surface_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_chrome_start_surface_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_chrome_start_surface_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_chrome_start_surface_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_chrome_start_surface_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_chrome_start_surface_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_chrome_start_surface_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_chrome_start_surface_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_chrome_start_surface_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_chrome_start_surface_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_chrome_start_surface_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_chrome_start_surface_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_chrome_start_surface_strings.xml" lang="fi" type="android" />
-    <output filename="values-gu/android_chrome_start_surface_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_chrome_start_surface_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_chrome_start_surface_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_chrome_start_surface_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_chrome_start_surface_strings.xml" lang="gl" type="android" />
+    <output filename="values-gu/android_chrome_start_surface_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_chrome_start_surface_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_chrome_start_surface_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_chrome_start_surface_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_chrome_start_surface_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_chrome_start_surface_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_chrome_start_surface_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_chrome_start_surface_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_chrome_start_surface_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_chrome_start_surface_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_chrome_start_surface_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_chrome_start_surface_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_chrome_start_surface_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_chrome_start_surface_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_chrome_start_surface_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_chrome_start_surface_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_chrome_start_surface_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_chrome_start_surface_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_chrome_start_surface_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_chrome_start_surface_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_chrome_start_surface_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_chrome_start_surface_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_chrome_start_surface_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_chrome_start_surface_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_chrome_start_surface_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_chrome_start_surface_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_chrome_start_surface_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_chrome_start_surface_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_chrome_start_surface_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_chrome_start_surface_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_chrome_start_surface_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_chrome_start_surface_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_chrome_start_surface_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_chrome_start_surface_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_chrome_start_surface_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_chrome_start_surface_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_chrome_start_surface_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_chrome_start_surface_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_chrome_start_surface_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_start_surface_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_chrome_start_surface_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_start_surface_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_chrome_start_surface_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_chrome_start_surface_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_chrome_start_surface_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_chrome_start_surface_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_chrome_start_surface_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_start_surface_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_start_surface_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_chrome_start_surface_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_start_surface_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_chrome_start_surface_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_chrome_start_surface_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_chrome_start_surface_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_start_surface_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_start_surface_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_start_surface_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_start_surface_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_start_surface_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_start_surface_strings_ta.xtb" />
diff --git a/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni b/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni
index af55df2e5a3..b5e874664f2 100644
--- a/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni
+++ b/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni
@@ -2,4 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-start_surface_public_java_sources = [ "//chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurface.java" ]
+start_surface_public_java_sources = [
+  "//chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurface.java",
+  "//chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java",
+]
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index 7ddb3b4522b..3c9d21d78dc 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -19,7 +19,59 @@ java_strings_grd("java_strings_grd") {
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [
+    "java/res/anim/iph_hovered_card_animation.xml",
+    "java/res/anim/iph_selected_card_animation.xml",
+    "java/res/anim/iph_selected_card_color_change_animation.xml",
+    "java/res/anim/iph_touch_point_alpha_animation.xml",
+    "java/res/anim/iph_touch_point_animation.xml",
+    "java/res/anim/iph_touch_point_background_alpha_animation.xml",
+    "java/res/anim/iph_touch_point_background_animation.xml",
+    "java/res/color/dark_text_color_list.xml",
+    "java/res/drawable-hdpi/tabstrip_selected.png",
+    "java/res/drawable-mdpi/tabstrip_selected.png",
+    "java/res/drawable-v21/fake_search_box_bg_incognito.xml",
+    "java/res/drawable-xhdpi/tabstrip_selected.png",
+    "java/res/drawable-xxhdpi/tabstrip_selected.png",
+    "java/res/drawable-xxxhdpi/tabstrip_selected.png",
+    "java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
+    "java/res/drawable/hovered_tab_grid_card_background.xml",
+    "java/res/drawable/ic_check_googblue_20dp_animated.xml",
+    "java/res/drawable/iph_drag_and_drop_animated_drawable.xml",
+    "java/res/drawable/iph_drag_and_drop_drawable.xml",
+    "java/res/drawable/popup_bg_dark.xml",
+    "java/res/drawable/selected_tab_background.xml",
+    "java/res/drawable/selected_tab_background_incognito.xml",
+    "java/res/drawable/single_tab_background.xml",
+    "java/res/drawable/tab_grid_dialog_background.xml",
+    "java/res/drawable/tab_grid_dialog_background_incognito.xml",
+    "java/res/drawable/tab_grid_selection_list_icon.xml",
+    "java/res/drawable/tabstrip_favicon_background.xml",
+    "java/res/drawable/ungroup_bar_background.xml",
+    "java/res/layout/bottom_tab_grid_toolbar.xml",
+    "java/res/layout/bottom_tab_strip_toolbar.xml",
+    "java/res/layout/closable_tab_grid_card_item.xml",
+    "java/res/layout/closable_tab_list_card_item.xml",
+    "java/res/layout/iph_drag_and_drop_dialog_layout.xml",
+    "java/res/layout/new_tab_tile_card_item.xml",
+    "java/res/layout/selectable_tab_grid_card_item.xml",
+    "java/res/layout/selectable_tab_list_card_item.xml",
+    "java/res/layout/single_tab_view_layout.xml",
+    "java/res/layout/tab_grid_card_item.xml",
+    "java/res/layout/tab_grid_dialog_layout.xml",
+    "java/res/layout/tab_grid_message_card_item.xml",
+    "java/res/layout/tab_list_card_item.xml",
+    "java/res/layout/tab_list_recycler_view_layout.xml",
+    "java/res/layout/tab_selection_editor_layout.xml",
+    "java/res/layout/tab_selection_editor_toolbar.xml",
+    "java/res/layout/tab_strip_item.xml",
+    "java/res/layout/tasks_view_layout.xml",
+    "java/res/values/colors.xml",
+    "java/res/values/dimens.xml",
+    "java/res/values/drawables.xml",
+    "java/res/values/ids.xml",
+    "java/res/values/styles.xml",
+  ]
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
@@ -28,17 +80,30 @@ android_resources("java_resources") {
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/SingleTabView.java",
+    "java/src/org/chromium/chrome/browser/tasks/SingleTabViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/SingleTabViewProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksView.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java",
     "java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageCardViewModel.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardView.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewProperties.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java",
@@ -52,28 +117,26 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParent.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogParent.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogProperties.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelToolbarCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiParent.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiProperties.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java",
@@ -91,8 +154,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorToolbar.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarViewProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardViewModel.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageService.java",
@@ -100,15 +161,16 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiColorProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/BaselineStaleTabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProviderConfiguration.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcher.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcherResults.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
   ]
 
   deps = [
@@ -117,28 +179,32 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/android:ui_locale_string_resources",
     "//chrome/android/features/start_surface/internal:java",
-    "//chrome/android/public/profiles:java",
     "//chrome/app:java_strings_grd",
+    "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
-    "//chrome/browser/ui/android/styles:java",
-    "//chrome/browser/ui/android/widget:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//chrome/lib/lifecycle/public/android:java",
+    "//components/browser_ui/styles/android:java",
+    "//components/browser_ui/widget/android:java",
+    "//components/embedder_support/android:util_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/policy/android:policy_java",
     "//components/search_engines/android:java",
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_deps:com_android_support_support_v13_java",
+    "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
+    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//ui/android:ui_java",
   ]
 }
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index 6c3268dbf39..4822c50885f 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for tab ui DFM of Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_chrome_tab_ui_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_tab_ui_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_chrome_tab_ui_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_chrome_tab_ui_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_chrome_tab_ui_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_chrome_tab_ui_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_chrome_tab_ui_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_chrome_tab_ui_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_chrome_tab_ui_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_chrome_tab_ui_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_chrome_tab_ui_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_chrome_tab_ui_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_chrome_tab_ui_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_chrome_tab_ui_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_chrome_tab_ui_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_chrome_tab_ui_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_chrome_tab_ui_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_chrome_tab_ui_strings.xml" lang="fi" type="android" />
-    <output filename="values-gu/android_chrome_tab_ui_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_chrome_tab_ui_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_chrome_tab_ui_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_chrome_tab_ui_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_chrome_tab_ui_strings.xml" lang="gl" type="android" />
+    <output filename="values-gu/android_chrome_tab_ui_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_chrome_tab_ui_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_chrome_tab_ui_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_chrome_tab_ui_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_chrome_tab_ui_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_chrome_tab_ui_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_chrome_tab_ui_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_chrome_tab_ui_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_chrome_tab_ui_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_chrome_tab_ui_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_chrome_tab_ui_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_chrome_tab_ui_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_chrome_tab_ui_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_chrome_tab_ui_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_chrome_tab_ui_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_chrome_tab_ui_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_chrome_tab_ui_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_chrome_tab_ui_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_chrome_tab_ui_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_chrome_tab_ui_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_chrome_tab_ui_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_chrome_tab_ui_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_chrome_tab_ui_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_chrome_tab_ui_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_chrome_tab_ui_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_chrome_tab_ui_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_chrome_tab_ui_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_chrome_tab_ui_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_chrome_tab_ui_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_chrome_tab_ui_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_chrome_tab_ui_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_chrome_tab_ui_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_chrome_tab_ui_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_chrome_tab_ui_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_chrome_tab_ui_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_chrome_tab_ui_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_chrome_tab_ui_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_chrome_tab_ui_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_chrome_tab_ui_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_tab_ui_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_chrome_tab_ui_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_tab_ui_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_chrome_tab_ui_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_chrome_tab_ui_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_chrome_tab_ui_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_chrome_tab_ui_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_chrome_tab_ui_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_tab_ui_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_tab_ui_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_chrome_tab_ui_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_tab_ui_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_chrome_tab_ui_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_chrome_tab_ui_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_chrome_tab_ui_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_tab_ui_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_tab_ui_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_tab_ui_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_tab_ui_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_tab_ui_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_tab_ui_strings_ta.xtb" />
@@ -253,6 +281,20 @@
           other {Close <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
         }
       </message>
+
+      <!-- Accessibility strings for Tab Reordering -->
+      <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_LEFT" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab next to it on the left side in the grid to achieve reordering.">
+          Move tab left
+      </message>
+       <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_RIGHT" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab next to it on the right side in the grid to achieve reordering.">
+          Move tab right
+      </message>
+       <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_UP" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab above it in the grid to achieve reordering.">
+          Move tab up
+      </message>
+       <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_DOWN" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab below it in the grid to achieve reordering.">
+          Move tab down
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
index 488d6b6567a..90c36784cbe 100644
--- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -27,17 +27,22 @@ public_tab_management_java_sources = [
 public_tab_management_java_sources += start_surface_public_java_sources
 
 tab_management_test_java_sources = [
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/RecyclerViewMatcherUtils.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridAccessibilityHelperTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemViewBinderTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogViewBinderTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarViewBinderTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiViewBinderTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java",
@@ -50,6 +55,7 @@ tab_management_test_java_sources = [
 
 tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinderUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTabUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCacheUnitTest.java",
@@ -57,14 +63,16 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtilsUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java",
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemMediatorUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProviderUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageServiceUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediatorUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilitiesUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUnitTestUtils.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserverTest.java",
diff --git a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
index b7dcdf918ae..7f001c66b1a 100644
--- a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
+++ b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
@@ -8,7 +8,7 @@ import("//chrome/android/modules/buildflags.gni")
 import("//tools/grit/grit_rule.gni")
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
+  sources = [ "java/res/raw/dummy_resource" ]
   custom_package = "org.chromium.chrome.features.test_dummy"
 }
 
@@ -21,7 +21,7 @@ android_library("java") {
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  java_files =
+  sources =
       [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -29,9 +29,7 @@ android_library("java") {
 }
 
 source_set("native") {
-  sources = [
-    "test_dummy_impl.cc",
-  ]
+  sources = [ "test_dummy_impl.cc" ]
 
   deps = [
     ":jni_headers",
@@ -53,16 +51,16 @@ android_library("base_module_java") {
     "//chrome/android/modules/test_dummy/provider:java",
     "//chrome/android/modules/test_dummy/public:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",
   ]
 }
 
 generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java",
-  ]
+  sources =
+      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
 }
 
 # Cannot call this just "resources" since all targets with that name in
@@ -74,5 +72,4 @@ grit("resources_native") {
     "test_dummy_resources.pak",
   ]
   output_dir = "$root_gen_dir/chrome"
-  depfile_dir = target_gen_dir
 }
diff --git a/chromium/chrome/android/features/test_dummy/public/BUILD.gn b/chromium/chrome/android/features/test_dummy/public/BUILD.gn
index 128169cb979..2018bea5c16 100644
--- a/chromium/chrome/android/features/test_dummy/public/BUILD.gn
+++ b/chromium/chrome/android/features/test_dummy/public/BUILD.gn
@@ -5,6 +5,6 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files =
+  sources =
       [ "java/src/org/chromium/chrome/features/test_dummy/TestDummy.java" ]
 }
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index b8f48e66511..ac1da8c95ae 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -19,24 +19,24 @@ java_strings_grd("java_strings_grd") {
 }
 
 android_resources("java_resources") {
-  resource_dirs = [ "java/res" ]
-
-  deps = [
-    ":java_strings_grd",
+  sources = [
+    "java/res/drawable-hdpi/vr_services.png",
+    "java/res/drawable-mdpi/vr_services.png",
+    "java/res/drawable-xhdpi/vr_services.png",
+    "java/res/drawable-xxhdpi/vr_services.png",
+    "java/res/drawable-xxxhdpi/vr_services.png",
   ]
 
+  deps = [ ":java_strings_grd" ]
+
   custom_package = "org.chromium.chrome.vr"
 }
 
 android_library("java") {
-  java_files = [
+  sources = [
     "java/src/org/chromium/chrome/browser/vr/AndroidUiGestureTarget.java",
     "java/src/org/chromium/chrome/browser/vr/AndroidVSyncHelper.java",
     "java/src/org/chromium/chrome/browser/vr/EmptySniffingVrViewContainer.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/BuildConstants.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java",
-    "java/src/org/chromium/chrome/browser/vr/keyboard/VrInputMethodManagerWrapper.java",
     "java/src/org/chromium/chrome/browser/vr/NoopCanvas.java",
     "java/src/org/chromium/chrome/browser/vr/OnDispatchTouchEventCallback.java",
     "java/src/org/chromium/chrome/browser/vr/VrAlertDialog.java",
@@ -46,13 +46,13 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/vr/VrCoreVersionChecker.java",
     "java/src/org/chromium/chrome/browser/vr/VrDaydreamApi.java",
     "java/src/org/chromium/chrome/browser/vr/VrDelegateImpl.java",
-    "java/src/org/chromium/chrome/browser/vr/VrIntentDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrDelegateProviderImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrDialog.java",
     "java/src/org/chromium/chrome/browser/vr/VrDialogManager.java",
     "java/src/org/chromium/chrome/browser/vr/VrFeedbackStatus.java",
     "java/src/org/chromium/chrome/browser/vr/VrFirstRunActivity.java",
     "java/src/org/chromium/chrome/browser/vr/VrInputConnection.java",
+    "java/src/org/chromium/chrome/browser/vr/VrIntentDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/vr/VrModalPresenter.java",
     "java/src/org/chromium/chrome/browser/vr/VrPopupWindow.java",
     "java/src/org/chromium/chrome/browser/vr/VrShell.java",
@@ -62,6 +62,10 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/vr/VrUiWidgetFactory.java",
     "java/src/org/chromium/chrome/browser/vr/VrViewContainer.java",
     "java/src/org/chromium/chrome/browser/vr/VrWindowAndroid.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/BuildConstants.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java",
+    "java/src/org/chromium/chrome/browser/vr/keyboard/VrInputMethodManagerWrapper.java",
   ]
 
   deps = [
@@ -69,16 +73,21 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/profiles/android:java",
     "//chrome/browser/util:java",
+    "//components/browser_ui/modaldialog/android:java",
+    "//components/embedder_support/android:content_view_java",
+    "//components/infobars/core:infobar_enums_java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
-    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
-    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/gvr-android-keyboard:kb_java",
     "//third_party/gvr-android-sdk:gvr_common_java",
     "//ui/android:ui_full_java",
diff --git a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
index c66841203ee..c130fb83032 100644
--- a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
+++ b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
@@ -2,10 +2,15 @@
 <!-- android_chrome_strings.grd contains strings for VR DFM of Chrome for Android. -->
 <grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
   <outputs>
+    <output filename="values-af/android_chrome_vr_strings.xml" lang="af" type="android" />
     <output filename="values-am/android_chrome_vr_strings.xml" lang="am" type="android" />
     <output filename="values-ar/android_chrome_vr_strings.xml" lang="ar" type="android" />
+    <output filename="values-as/android_chrome_vr_strings.xml" lang="as" type="android" />
+    <output filename="values-az/android_chrome_vr_strings.xml" lang="az" type="android" />
+    <output filename="values-be/android_chrome_vr_strings.xml" lang="be" type="android" />
     <output filename="values-bg/android_chrome_vr_strings.xml" lang="bg" type="android" />
     <output filename="values-bn/android_chrome_vr_strings.xml" lang="bn" type="android" />
+    <output filename="values-bs/android_chrome_vr_strings.xml" lang="bs" type="android" />
     <output filename="values-ca/android_chrome_vr_strings.xml" lang="ca" type="android" />
     <output filename="values-cs/android_chrome_vr_strings.xml" lang="cs" type="android" />
     <output filename="values-da/android_chrome_vr_strings.xml" lang="da" type="android" />
@@ -16,34 +21,52 @@
     <output filename="values-es/android_chrome_vr_strings.xml" lang="es" type="android" />
     <output filename="values-es-rUS/android_chrome_vr_strings.xml" lang="es-419" type="android" />
     <output filename="values-et/android_chrome_vr_strings.xml" lang="et" type="android" />
+    <output filename="values-eu/android_chrome_vr_strings.xml" lang="eu" type="android" />
     <output filename="values-fa/android_chrome_vr_strings.xml" lang="fa" type="android" />
     <output filename="values-fi/android_chrome_vr_strings.xml" lang="fi" type="android" />
     <output filename="values-tl/android_chrome_vr_strings.xml" lang="fil" type="android" />
     <output filename="values-fr/android_chrome_vr_strings.xml" lang="fr" type="android" />
+    <output filename="values-fr-rCA/android_chrome_vr_strings.xml" lang="fr-CA" type="android" />
+    <output filename="values-gl/android_chrome_vr_strings.xml" lang="gl" type="android" />
     <output filename="values-gu/android_chrome_vr_strings.xml" lang="gu" type="android" />
     <output filename="values-hi/android_chrome_vr_strings.xml" lang="hi" type="android" />
     <output filename="values-hr/android_chrome_vr_strings.xml" lang="hr" type="android" />
     <output filename="values-hu/android_chrome_vr_strings.xml" lang="hu" type="android" />
+    <output filename="values-hy/android_chrome_vr_strings.xml" lang="hy" type="android" />
     <output filename="values-in/android_chrome_vr_strings.xml" lang="id" type="android" />
+    <output filename="values-is/android_chrome_vr_strings.xml" lang="is" type="android" />
     <output filename="values-it/android_chrome_vr_strings.xml" lang="it" type="android" />
     <output filename="values-iw/android_chrome_vr_strings.xml" lang="iw" type="android" />
     <output filename="values-ja/android_chrome_vr_strings.xml" lang="ja" type="android" />
+    <output filename="values-ka/android_chrome_vr_strings.xml" lang="ka" type="android" />
+    <output filename="values-kk/android_chrome_vr_strings.xml" lang="kk" type="android" />
+    <output filename="values-km/android_chrome_vr_strings.xml" lang="km" type="android" />
     <output filename="values-kn/android_chrome_vr_strings.xml" lang="kn" type="android" />
     <output filename="values-ko/android_chrome_vr_strings.xml" lang="ko" type="android" />
+    <output filename="values-ky/android_chrome_vr_strings.xml" lang="ky" type="android" />
+    <output filename="values-lo/android_chrome_vr_strings.xml" lang="lo" type="android" />
     <output filename="values-lt/android_chrome_vr_strings.xml" lang="lt" type="android" />
     <output filename="values-lv/android_chrome_vr_strings.xml" lang="lv" type="android" />
+    <output filename="values-mk/android_chrome_vr_strings.xml" lang="mk" type="android" />
     <output filename="values-ml/android_chrome_vr_strings.xml" lang="ml" type="android" />
+    <output filename="values-mn/android_chrome_vr_strings.xml" lang="mn" type="android" />
     <output filename="values-mr/android_chrome_vr_strings.xml" lang="mr" type="android" />
     <output filename="values-ms/android_chrome_vr_strings.xml" lang="ms" type="android" />
+    <output filename="values-my/android_chrome_vr_strings.xml" lang="my" type="android" />
+    <output filename="values-ne/android_chrome_vr_strings.xml" lang="ne" type="android" />
     <output filename="values-nl/android_chrome_vr_strings.xml" lang="nl" type="android" />
     <output filename="values-nb/android_chrome_vr_strings.xml" lang="no" type="android" />
+    <output filename="values-or/android_chrome_vr_strings.xml" lang="or" type="android" />
+    <output filename="values-pa/android_chrome_vr_strings.xml" lang="pa" type="android" />
     <output filename="values-pl/android_chrome_vr_strings.xml" lang="pl" type="android" />
     <output filename="values-pt-rBR/android_chrome_vr_strings.xml" lang="pt-BR" type="android" />
     <output filename="values-pt-rPT/android_chrome_vr_strings.xml" lang="pt-PT" type="android" />
     <output filename="values-ro/android_chrome_vr_strings.xml" lang="ro" type="android" />
     <output filename="values-ru/android_chrome_vr_strings.xml" lang="ru" type="android" />
+    <output filename="values-si/android_chrome_vr_strings.xml" lang="si" type="android" />
     <output filename="values-sk/android_chrome_vr_strings.xml" lang="sk" type="android" />
     <output filename="values-sl/android_chrome_vr_strings.xml" lang="sl" type="android" />
+    <output filename="values-sq/android_chrome_vr_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_vr_strings.xml" lang="sr" type="android" />
     <output filename="values-sv/android_chrome_vr_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_vr_strings.xml" lang="sw" type="android" />
@@ -52,9 +75,13 @@
     <output filename="values-th/android_chrome_vr_strings.xml" lang="th" type="android" />
     <output filename="values-tr/android_chrome_vr_strings.xml" lang="tr" type="android" />
     <output filename="values-uk/android_chrome_vr_strings.xml" lang="uk" type="android" />
+    <output filename="values-ur/android_chrome_vr_strings.xml" lang="ur" type="android" />
+    <output filename="values-uz/android_chrome_vr_strings.xml" lang="uz" type="android" />
     <output filename="values-vi/android_chrome_vr_strings.xml" lang="vi" type="android" />
     <output filename="values-zh-rCN/android_chrome_vr_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rHK/android_chrome_vr_strings.xml" lang="zh-HK" type="android" />
     <output filename="values-zh-rTW/android_chrome_vr_strings.xml" lang="zh-TW" type="android" />
+    <output filename="values-zu/android_chrome_vr_strings.xml" lang="zu" type="android" />
   </outputs>
   <translations>
     <file lang="af" path="translations/android_chrome_vr_strings_af.xtb" />
@@ -122,6 +149,7 @@
     <file lang="sl" path="translations/android_chrome_vr_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_vr_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_vr_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_vr_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_vr_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_vr_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_vr_strings_ta.xtb" />
diff --git a/chromium/chrome/android/features/vr/public_vr_java_sources.gni b/chromium/chrome/android/features/vr/public_vr_java_sources.gni
index 57677016c90..219a498aa53 100644
--- a/chromium/chrome/android/features/vr/public_vr_java_sources.gni
+++ b/chromium/chrome/android/features/vr/public_vr_java_sources.gni
@@ -8,12 +8,12 @@ public_vr_java_sources = [
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/OnExitVrRequestListener.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrDelegate.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrDelegateFallback.java",
-  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrFallbackUtils.java",
-  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrIntentDelegateFallback.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrDelegateProvider.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrDelegateProviderFallback.java",
+  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrFallbackUtils.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrIntentDelegate.java",
-  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModeObserver.java",
+  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrIntentDelegateFallback.java",
+  "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModeProviderImpl.java",
   "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java",
 ]
 
diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni
index 87d57532413..a082f240ff3 100644
--- a/chromium/chrome/android/features/vr/vr_module.gni
+++ b/chromium/chrome/android/features/vr/vr_module.gni
@@ -13,4 +13,9 @@ vr_module_desc = {
   android_manifest = "//chrome/android/features/vr/java/AndroidManifest.xml"
   native_deps = [ "//chrome/browser/vr:vr_ui" ]
   native_entrypoints = "//chrome/browser/vr/module_exports.lst"
+
+  # For VR, Module.getImpl() gets called before native library loads (required
+  # by native library load). Therefore disable auto-load on Module.getImpl();
+  # the VR DFM manages its own loading on start-up and on install.
+  load_native_on_get_impl = false
 }