diff --git a/conf/init.gs101.usb.rc b/conf/init.gs101.usb.rc
index 6b04012e..110d1b7b 100644
--- a/conf/init.gs101.usb.rc
+++ b/conf/init.gs101.usb.rc
@@ -71,6 +71,45 @@ on early-boot
     # acm function for uwb
     mkdir /config/usb_gadget/g1/functions/acm.uwb0
 
+    # uvc function
+    mkdir /config/usb_gadget/g1/functions/uvc.0
+    write /config/usb_gadget/g1/functions/uvc.0/function_name "Android Webcam"
+    write /config/usb_gadget/g1/functions/uvc.0/streaming_maxpacket 3072
+    # write /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst 5
+    # write /config/usb_gadget/g1/functions/uvc.0/streaming_interval 2
+    # setup control params
+    mkdir /config/usb_gadget/g1/functions/uvc.0/control/header/h
+    symlink /config/usb_gadget/g1/functions/uvc.0/control/header/h /config/usb_gadget/g1/functions/uvc.0/control/class/fs/h
+    symlink /config/usb_gadget/g1/functions/uvc.0/control/header/h /config/usb_gadget/g1/functions/uvc.0/control/class/ss/h
+    # advertise 720p resolution for webcam encoded as mjpeg
+    mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m
+    mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wHeight 720
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wWidth 1280
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMaxVideoFrameBufferSize 1843200
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwDefaultFrameInterval 333333
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwFrameInterval "166666
+333333
+416666
+666666"
+    # advertise 1080p resolution for webcam encoded as mjpeg
+    mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wHeight 1080
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wWidth 1920
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMaxVideoFrameBufferSize 4147200
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwDefaultFrameInterval 333333
+    write /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwFrameInterval "166666
+333333
+416666
+666666"
+    # TODO: Add uncompressed streams
+    # setup streaming params
+    mkdir /config/usb_gadget/g1/functions/uvc.0/streaming/header/h
+    symlink /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/m
+    symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/fs/h
+    symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/hs/h
+    symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/ss/h
+
     # chown file/folder permission
     chown system system /config/usb_gadget/
     chown system system /config/usb_gadget/g1
@@ -135,6 +174,99 @@ on early-boot
     chown system system /config/usb_gadget/g1/functions/rndis.gs4/protocol
     chown system system /config/usb_gadget/g1/functions/rndis.gs4/qmult
     chown system system /config/usb_gadget/g1/functions/rndis.gs4/subclass
+    chown system system /config/usb_gadget/g1/functions/uvc.0
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/bInterfaceNumber
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/class
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/class/fs
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/class/fs/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/class/ss
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/class/ss/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/header
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/header/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/header/h/bcdUVC
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/header/h/dwClockFrequency
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default/bmControls
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default/bSourceID
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default/bUnitID
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default/iProcessing
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/processing/default/wMaxMultiplier
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/bAssocTerminal
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/bmControls
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/bTerminalID
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/iTerminal
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/wObjectiveFocalLengthMax
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/wObjectiveFocalLengthMin
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/wOcularFocalLength
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/camera/default/wTerminalType
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/bAssocTerminal
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/bSourceID
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/bTerminalID
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/iTerminal
+    chown system system /config/usb_gadget/g1/functions/uvc.0/control/terminal/output/default/wTerminalType
+    chown system system /config/usb_gadget/g1/functions/uvc.0/function_name
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming_interval
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming_maxburst
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming_maxpacket
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/bInterfaceNumber
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/fs
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/fs/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/hs
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/hs/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/ss
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/class/ss/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/color_matching
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/color_matching/default
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/color_matching/default/bColorPrimaries
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/color_matching/default/bMatrixCoefficients
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/color_matching/default/bTransferCharacteristics
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/bmInfo
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/bStillCaptureMethod
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/bTerminalLink
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/bTriggerSupport
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/bTriggerUsage
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/header/h/m
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/bFrameIndex
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/bmCapabilities
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwDefaultFrameInterval
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwFrameInterval
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMaxBitRate
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMaxVideoFrameBufferSize
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/dwMinBitRate
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wHeight
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/1080p/wWidth
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bFrameIndex
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/bmCapabilities
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwDefaultFrameInterval
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwFrameInterval
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMaxBitRate
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMaxVideoFrameBufferSize
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/dwMinBitRate
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wHeight
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/720p/wWidth
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bAspectRatioX
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bAspectRatioY
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bDefaultFrameIndex
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bFormatIndex
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bmaControls
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bmFlags
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/mjpeg/m/bmInterlaceFlags
+    chown system system /config/usb_gadget/g1/functions/uvc.0/streaming/uncompressed
     chown system system /config/usb_gadget/g1/idProduct
     chown system system /config/usb_gadget/g1/idVendor
     chown system system /config/usb_gadget/g1/max_speed
diff --git a/device.mk b/device.mk
index 4f2c2029..d5789536 100644
--- a/device.mk
+++ b/device.mk
@@ -608,6 +608,7 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\
 	frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\
 	vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml\
+	vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.stream-usecase.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.stream-usecase.xml\
 
 #PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 2ea2e8f9..4de046e1 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -57,7 +57,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             UFS_ERR_PATH(auto_hibern8_err_count)
         },
         .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
-        .TempResidencyPath = "/sys/kernel/metrics/temp_residency/temp_residency_all/stats",
+        .TempResidencyPaths = {
+            "/sys/kernel/metrics/thermal/tr_by_group/tmu/stats",
+            "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats",
+        },
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {
diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp
index 93138635..d0e16ee5 100644
--- a/usb/gadget/UsbGadget.cpp
+++ b/usb/gadget/UsbGadget.cpp
@@ -26,6 +26,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <android-base/properties.h>
+
 #include <aidl/android/frameworks/stats/IStats.h>
 
 namespace aidl {
@@ -40,6 +42,9 @@ constexpr char kI2CPath[] = "/sys/devices/platform/10d50000.hsi2c/i2c-";
 constexpr char kAccessoryLimitCurrent[] = "i2c-max77759tcpc/usb_limit_accessory_current";
 constexpr char kAccessoryLimitCurrentEnable[] = "i2c-max77759tcpc/usb_limit_accessory_enable";
 
+using ::android::base::GetBoolProperty;
+using ::android::hardware::google::pixel::usb::kUvcEnabled;
+
 UsbGadget::UsbGadget() : mGadgetIrqPath("") {
     if (access(OS_DESC_PATH, R_OK) != 0) {
         ALOGE("configfs setup not done yet");
@@ -154,8 +159,8 @@ Status UsbGadget::tearDownGadget() {
     return Status::SUCCESS;
 }
 
-static Status validateAndSetVidPid(uint64_t functions) {
-    Status ret = Status::SUCCESS;
+static Status validateAndSetVidPid(int64_t functions) {
+    Status ret;
     std::string vendorFunctions = getVendorFunctions();
 
     switch (functions) {
@@ -302,6 +307,28 @@ static Status validateAndSetVidPid(uint64_t functions) {
                 ret = Status(setVidPid("0x18d1", "0x4eec"));
             }
             break;
+        case GadgetFunction::UVC:
+            if (!(vendorFunctions == "user" || vendorFunctions == "")) {
+                ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
+                ret = Status::CONFIGURATION_NOT_SUPPORTED;
+            } else if (!GetBoolProperty(kUvcEnabled, false)) {
+                ALOGE("UVC function not enabled by config");
+                ret = Status::CONFIGURATION_NOT_SUPPORTED;
+            } else {
+                ret = Status(setVidPid("0x18d1", "0x4eed"));
+            }
+            break;
+        case GadgetFunction::ADB | GadgetFunction::UVC:
+            if (!(vendorFunctions == "user" || vendorFunctions == "")) {
+                ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
+                ret = Status::CONFIGURATION_NOT_SUPPORTED;
+            } else if (!GetBoolProperty(kUvcEnabled, false)) {
+                ALOGE("UVC function not enabled by config");
+                ret = Status::CONFIGURATION_NOT_SUPPORTED;
+            } else {
+                ret = Status(setVidPid("0x18d1", "0x4eee"));
+            }
+            break;
         default:
             ALOGE("Combination not supported");
             ret = Status::CONFIGURATION_NOT_SUPPORTED;
@@ -519,9 +546,7 @@ ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions,
     }
 
     ALOGI("Usb Gadget setcurrent functions called successfully");
-    return ScopedAStatus::fromServiceSpecificErrorWithMessage(
-                -1, "Usb Gadget setcurrent functions called successfully");
-
+    return ScopedAStatus::ok();
 
 error:
     ALOGI("Usb Gadget setcurrent functions failed");
diff --git a/usb/gadget/android.hardware.usb.gadget-service.rc b/usb/gadget/android.hardware.usb.gadget-service.rc
index 3c9c1cce..ba7d5f69 100644
--- a/usb/gadget/android.hardware.usb.gadget-service.rc
+++ b/usb/gadget/android.hardware.usb.gadget-service.rc
@@ -1,8 +1,7 @@
 service vendor.usb-gadget-hal /vendor/bin/hw/android.hardware.usb.gadget-service.gs101
     class hal
     user system
-    group system shell mtp wakelock
-    capabilities WAKE_ALARM BLOCK_SUSPEND
+    group system shell mtp
 
 on post-fs
     chown root system /sys/class/typec/port0/power_role