diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index 88fee50..504eecc 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -889,7 +889,7 @@
 
     <path name="ultrasound-mic">
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
     </path>
diff --git a/cast_auth/mediadrm/Android.bp b/cast_auth/mediadrm/Android.bp
index 5c098ba..1dc4e32 100644
--- a/cast_auth/mediadrm/Android.bp
+++ b/cast_auth/mediadrm/Android.bp
@@ -2,6 +2,15 @@
 // ----------------------------------------------------------------------------
 // Builds android.hardware.drm-service.castkey
 //
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_tangorpro_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_tangorpro_license"],
+}
+
 cc_binary {
     name: "android.hardware.drm-service.castkey",
     defaults: ["castkey_service_defaults"],
@@ -36,4 +45,4 @@ cc_defaults {
         "liblog",
         "libutils",
     ],
-}
\ No newline at end of file
+}
diff --git a/powerhint.json b/powerhint.json
index ccfc4c7..bee53fd 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1834,6 +1834,12 @@
       "Duration": 0,
       "Value": "0,1,2,3"
     },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",