diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index b1d2d4dc..7883c20c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -133,6 +133,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
+BOARD_AVB_VBMETA_SYSTEM += pvmfw
+endif
+
# Enable chained vbmeta for boot images
BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048
diff --git a/OWNERS b/OWNERS
index 4d9cf6e4..68657e89 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,5 @@
per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
+
+# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
+per-file *.mk=file:device/google/gs-common:master:/OWNERS
diff --git a/device.mk b/device.mk
index 2699de45..cf12b257 100644
--- a/device.mk
+++ b/device.mk
@@ -261,7 +261,7 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_VENDOR_PROPERTIES += \
ro.opengles.version=196610 \
graphics.gpu.profiler.support=true \
- debug.renderengine.backend=skiaglthreaded
+ debug.renderengine.backend=skiavkthreaded
# GRAPHICS - GPU (end)
# ####################
diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index a35aba11..cddd6177 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -47,11 +47,11 @@
-
+
-
-
+
+
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 7000661b..e49ef219 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -142,38 +142,37 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
@@ -250,5 +249,13 @@
+
+
+
+
+
+
+
+
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 7fccdd15..bb57116d 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -158,4 +158,10 @@
true
+
+
+ true
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 74f6868c..7378fc11 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -819,7 +819,9 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
status = getPortStatusHelper(usb, currentPortStatus);
queryMoistureDetectionStatus(currentPortStatus);
queryPowerTransferStatus(currentPortStatus);
+#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */
queryNonCompliantChargerStatus(currentPortStatus);
+#endif
if (usb->mCallback != NULL) {
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
status);