diff --git a/core/Makefile b/core/Makefile
index eaa3190..5e0d4df 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -192,6 +192,34 @@
 unique_product_copy_files_pairs :=
 unique_product_copy_files_destinations :=
 
+
+# Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)
+# The trios will contain the primary installed file : the directory to unzip the zip to : the zip
+define relevant-extra-install-zips
+$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \
+  $(if $(filter $(call word-colon,1,$(p)),$(1)), \
+    $(p))))
+endef
+
+# Writes a text file that contains all of the files that will be inside a partition.
+# All the file paths will be relative to the partition's staging directory.
+# It will also take into account files inside zips listed in EXTRA_INSTALL_ZIPS.
+#
+# Arguments:
+#   $(1): Output file
+#   $(2): The partition's staging directory
+#   $(3): Files to include in the partition
+define write-partition-file-list
+$(1): PRIVATE_FILES := $(subst $(2)/,,$(filter $(2)/%,$(3)))
+$(1): PRIVATE_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3)))
+$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(call word-colon,3,$(p)))
+	@echo Writing $$@
+	rm -f $$@
+	echo -n > $$@
+	$$(foreach f,$$(PRIVATE_FILES),echo "$$(f)" >> $$@$$(newline))
+	$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_EXTRA_INSTALL_ZIPS) >> $$@
+endef
+
 # -----------------------------------------------------------------
 # Returns the max allowed size for an image suitable for hash verification
 # (e.g., boot.img, recovery.img, etc).
@@ -1267,33 +1295,6 @@
 
 endif
 
-# Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)
-# The trios will contain the primary installed file : the directory to unzip the zip to : the zip
-define relevant-extra-install-zips
-$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \
-  $(if $(filter $(call word-colon,1,$(p)),$(1)), \
-    $(p))))
-endef
-
-# Writes a text file that contains all of the files that will be inside a partition.
-# All the file paths will be relative to the partition's staging directory.
-# It will also take into account files inside zips listed in EXTRA_INSTALL_ZIPS.
-#
-# Arguments:
-#   $(1): Output file
-#   $(2): The partition's staging directory
-#   $(3): Files to include in the partition
-define write-partition-file-list
-$(1): PRIVATE_FILES := $(subst $(2)/,,$(filter $(2)/%,$(3)))
-$(1): PRIVATE_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3)))
-$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(call word-colon,3,$(p)))
-	@echo Writing $$@
-	rm -f $$@
-	echo -n > $$@
-	$$(foreach f,$$(PRIVATE_FILES),echo "$$(f)" >> $$@$$(newline))
-	$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_EXTRA_INSTALL_ZIPS) >> $$@
-endef
-
 
 ramdisk_intermediates :=$= $(call intermediates-dir-for,PACKAGING,ramdisk)
 $(eval $(call write-partition-file-list,$(ramdisk_intermediates)/file_list.txt,$(TARGET_RAMDISK_OUT),$(INTERNAL_RAMDISK_FILES)))
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6b83535..769a6f7 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -230,21 +230,6 @@
 $(call soong_config_set_bool,google_graphics,board_uses_scaler_m2m1shot,$(if $(filter true,$(BOARD_USES_SCALER_M2M1SHOT)),true,false))
 $(call soong_config_set_bool,google_graphics,board_uses_align_restriction,$(if $(filter true,$(BOARD_USES_ALIGN_RESTRICTION)),true,false))
 
-# Export video_codec variables to soong for exynos modules
-$(call soong_config_set,video_codec,target_soc_name,$(TARGET_SOC_NAME))
-$(call soong_config_set_bool,video_codec,board_use_codec2_hidl_1_2,$(if $(filter true,$(BOARD_USE_CODEC2_HIDL_1_2)),true,false))
-$(call soong_config_set_bool,video_codec,board_support_mfc_enc_bt2020,$(if $(filter true,$(BOARD_SUPPORT_MFC_ENC_BT2020)),true,false))
-$(call soong_config_set_bool,video_codec,board_support_flexible_p010,$(if $(filter true,$(BOARD_SUPPORT_FLEXIBLE_P010)),true,false))
-$(call soong_config_set_bool,video_codec,board_use_codec2_aidl,$(if $(BOARD_USE_CODEC2_AIDL),true,false))
-$(call soong_config_set,video_codec,board_gpu_type,$(BOARD_GPU_TYPE))
-$(call soong_config_set_bool,video_codec,board_use_small_secure_memory,$(if $(filter true,$(BOARD_USE_SMALL_SECURE_MEMORY)),true,false))
-ifdef BOARD_SUPPORT_MFC_VERSION
-  $(call soong_config_set,video_codec,board_support_mfc_version,$(BOARD_SUPPORT_MFC_VERSION))
-endif
-ifdef BOARD_USE_MAX_SECURE_RESOURCE
-  $(call soong_config_set,video_codec,board_use_max_secure_resource,$(BOARD_USE_MAX_SECURE_RESOURCE))
-endif
-
 # Export related variables to soong for hardware/google/graphics/common/libacryl:libacryl
 ifdef BOARD_LIBACRYL_DEFAULT_COMPOSITOR
   $(call soong_config_set,acryl,libacryl_default_compositor,$(BOARD_LIBACRYL_DEFAULT_COMPOSITOR))
diff --git a/core/main.mk b/core/main.mk
index 83d42af..f96cf04 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -277,7 +277,10 @@
 # Include all of the makefiles in the system
 #
 
-subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk $(SOONG_ANDROID_MK)
+subdir_makefiles := \
+    $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).mk \
+    $(SOONG_ANDROID_MK) \
+    build/make/target/board/android-info.mk
 
 # Android.mk files are only used on Linux builds, Mac only supports Android.bp
 ifeq ($(HOST_OS),linux)
diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml
index 257c820..1956b6e 100644
--- a/core/robolectric_test_config_template.xml
+++ b/core/robolectric_test_config_template.xml
@@ -22,6 +22,13 @@
     <option name="exclude-paths" value="java" />
     <option name="use-robolectric-resources" value="true" />
 
+    <!-- attempt to always show Tradefed errors -->
+    <option name="do-not-swallow-runner-errors" value="true" />
+
+    <!-- prevent Tradefed from hanging indefinitely in CI -->
+    <option name="socket-timeout" value="600000" />
+    <option name="test-case-timeout" value="2m" />
+
     {EXTRA_CONFIGS}
 
     <test class="com.android.tradefed.testtype.IsolatedHostTest" >
diff --git a/target/board/Android.mk b/target/board/android-info.mk
similarity index 100%
rename from target/board/Android.mk
rename to target/board/android-info.mk
diff --git a/teams/Android.bp b/teams/Android.bp
index 21f5222..6307f5c 100644
--- a/teams/Android.bp
+++ b/teams/Android.bp
@@ -70,13 +70,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_cloud_platform",
-
-    // go/trendy/manage/engineers/5917762526281728
-    trendy_team_id: "5917762526281728",
-}
-
-team {
     name: "trendy_team_pixel_system_software",
 
     // go/trendy/manage/engineers/4856005120622592
@@ -518,13 +511,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_notifications_alerts_attention_management",
-
-    // go/trendy/manage/engineers/6267643681996800
-    trendy_team_id: "6267643681996800",
-}
-
-team {
     name: "trendy_team_fwk_nfc",
 
     // go/trendy/manage/engineers/5962312512864256
@@ -532,13 +518,6 @@
 }
 
 team {
-    name: "trendy_team_wear_personalization_developer_surfaces",
-
-    // go/trendy/manage/engineers/4819890988810240
-    trendy_team_id: "4819890988810240",
-}
-
-team {
     name: "trendy_team_srajkumar_team",
 
     // go/trendy/manage/engineers/5170053894012928
@@ -693,13 +672,6 @@
 }
 
 team {
-    name: "trendy_team_test_eng_android_wear",
-
-    // go/trendy/manage/engineers/4979150422933504
-    trendy_team_id: "4979150422933504",
-}
-
-team {
     name: "trendy_team_mesch_team",
 
     // go/trendy/manage/engineers/5205465899368448
@@ -721,13 +693,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_developer_devx",
-
-    // go/trendy/manage/engineers/4894890764697600
-    trendy_team_id: "4894890764697600",
-}
-
-team {
     name: "trendy_team_android_rust",
 
     // go/trendy/manage/engineers/4844600586305536
@@ -931,13 +896,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wallet_on_wear",
-
-    // go/trendy/manage/engineers/5724960437731328
-    trendy_team_id: "5724960437731328",
-}
-
-team {
     name: "trendy_team_glanceables",
 
     // go/trendy/manage/engineers/4658222004600832
@@ -1071,13 +1029,6 @@
 }
 
 team {
-    name: "trendy_team_wear_3xp",
-
-    // go/trendy/manage/engineers/5692317612539904
-    trendy_team_id: "5692317612539904",
-}
-
-team {
     name: "trendy_team_clockwork",
 
     // go/trendy/manage/engineers/4908781678755840
@@ -1211,13 +1162,6 @@
 }
 
 team {
-    name: "trendy_team_wear_software_nti",
-
-    // go/trendy/manage/engineers/5164973558759424
-    trendy_team_id: "5164973558759424",
-}
-
-team {
     name: "trendy_team_machine_learning",
 
     // go/trendy/manage/engineers/5276568318246912
@@ -1309,13 +1253,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_power_emulator",
-
-    // go/trendy/manage/engineers/5160338936725504
-    trendy_team_id: "5160338936725504",
-}
-
-team {
     name: "trendy_team_deprecated_framework_svetoslavganov",
 
     // go/trendy/manage/engineers/6404117492531200
@@ -1330,13 +1267,6 @@
 }
 
 team {
-    name: "trendy_team_wear_opus",
-
-    // go/trendy/manage/engineers/5098351636676608
-    trendy_team_id: "5098351636676608",
-}
-
-team {
     name: "trendy_team_text_to_speech",
 
     // go/trendy/manage/engineers/6368933120442368
@@ -1442,13 +1372,6 @@
 }
 
 team {
-    name: "trendy_team_wear_developer_foundation",
-
-    // go/trendy/manage/engineers/5239127108648960
-    trendy_team_id: "5239127108648960",
-}
-
-team {
     name: "trendy_team_tpm_tvc",
 
     // go/trendy/manage/engineers/5390683333230592
@@ -1456,13 +1379,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_ux",
-
-    // go/trendy/manage/engineers/5782097411080192
-    trendy_team_id: "5782097411080192",
-}
-
-team {
     name: "trendy_team_lse_desktop_os_experience",
 
     // go/trendy/manage/engineers/5125234900434944
@@ -1673,13 +1589,6 @@
 }
 
 team {
-    name: "trendy_team_wear_wear_assistant",
-
-    // go/trendy/manage/engineers/5848075306172416
-    trendy_team_id: "5848075306172416",
-}
-
-team {
     name: "trendy_team_android_power_and_comms_infra",
 
     // go/trendy/manage/engineers/5325547653332992