diff --git a/AndroidBoard.mk b/AndroidBoard.mk
new file mode 100644
index 0000000..6ec4ce4
--- /dev/null
+++ b/AndroidBoard.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2018 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+-include vendor/google_devices/muskie/proprietary/AndroidBoardVendor.mk
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 18219bc..9f945f1 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -89,6 +89,11 @@ gTxChainMask1ss=0
 # TPC power
 gSelfGenFrmPwr=3
 
+gReportMaxLinkSpeed=0
+
+# Use OEM provisioned MAC address
+enable_mac_provision=1
+
 ################ NAN feature set start ###################
 # Enable or Disable NAN
 # 1=Enable (default), 0=Disable
@@ -138,6 +143,9 @@ gTxBFEnable=1
 gSetTxChainmask1x1=1
 gSetRxChainmask1x1=1
 
+# 2.4GHz Antenna Sharing is not supported
+gForce1x1Exception=0
+
 #If set to 0, MCC is not allowed.
 gEnableMCCMode=1
 
@@ -220,11 +228,7 @@ gEnableIpTcpUdpChecksumOffload=1
 
 # Enable TCP Segmentation Offload
 # 1 - enable  0 - disable
-TSOEnable=0
-
-# Enable Large Recieve Offload
-# 1 - enable(default)  0 - disable
-LROEnable=1
+TSOEnable=1
 
 # Enable HT MPDU Density
 # 4 for 2 micro sec
@@ -240,6 +244,12 @@ ce_service_max_yield_time=500
 ce_service_max_rx_ind_flush=1
 maxMSDUsPerRxInd=8
 
+# Data Stall Debugging feature
+gEnableDataStallDetection=0
+
+# Dynamic configuration of TCP limit output bytes
+gTcpLimitOutputEnable=0
+
 ################ Datapath feature set End ################
 
 #############################################
@@ -270,14 +280,6 @@ gActiveMinChannelTime=20
 
 gPNOScanSupport=1
 
-# Perform PNO fast scan this many number of times
-gPNOScanTimerRepeatValue=6
-
-# PNO slow scan period = gPNOSlowScanMultiplier times PNO fast scan period
-# Example: fast scan period is passed from framework (default = 10 sec), then
-# PNO slow scan period = 60 sec.
-gPNOSlowScanMultiplier=6
-
 # Enable or Disable Extended Scan (GScan)
 # 1=Enable (default), 0=Disable
 gExtScanEnable=1
@@ -316,9 +318,11 @@ g_probe_req_ie_bitmap_0=0x0000000B
 # g_probe_req_ie_bitmap_3=0x00000000
 # g_probe_req_ie_bitmap_4=0x00000000
 # g_probe_req_ie_bitmap_5=0x00000000
-# g_probe_req_ie_bitmap_6=0x00000000
+g_probe_req_ie_bitmap_6=0x20000000
 # g_probe_req_ie_bitmap_7=0x00000000
 
+gProbeReqOUIs=0050F208
+
 #############################################
 # Power related configurations
 #############################################
@@ -373,7 +377,6 @@ EseEnabled=1
 
 gNeighborLookupThreshold=76
 gNeighborReassocThreshold=81
-gNeighborScanTimerPeriod=200
 gNeighborScanChannelMinTime=20
 gNeighborScanChannelMaxTime=30
 gMaxNeighborReqTries=3
@@ -411,6 +414,9 @@ gRoamOffloadEnabled=1
 
 gAllowDFSChannelRoam=1
 
+# LFR Subnet Detection
+gLFRSubnetDetectionEnable=0
+
 #############################################
 # Offload related configurations
 #############################################
@@ -461,6 +467,8 @@ gHwFilterMode=0
 # Default value of gEnableWoW is 3.
 # gEnableWoW=0
 
+# 11k feature offload
+11k_offload_enable_bitmask=0
 
 #############################################
 # Logging related configurations
@@ -578,9 +586,6 @@ gAPChannelSelectEndChannel=11
 # DFS Master Capability
 gEnableDFSMasterCap=1
 
-# Disable 11AC for hotspot
-gSapForce11NFor11AC=1
-
 #Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
 gAPAutoShutOff=0
 
@@ -595,8 +600,6 @@ gSapSccChanAvoidance=0
 #Enable/Disable Tx beamformee in SAP mode
 gEnableTxBFeeSAP=1
 
-
-
 #Enable/Disable dual MAC feature
 # 0 - enable DBS
 # 1 - disable DBS
@@ -616,6 +619,50 @@ enable_11d_in_world_mode=1
 
 gEnableLPRx=0
 
+gDptraceConfig=1,4,1,126
+
+gAP11ACOverride=0
+
+#Enable/Disable chain selection optimization for one chain dtim
+#Min: 0
+#MAX: 30
+gEnableDTIMSelectionDiversity=3
+
+#############################################
+# MAWC related configurations
+#############################################
+
+# MAWCEnabled - Enable/Disable Motion Aided Wireless Connectivity Global
+MAWCEnabled=0
+
+# mawc_roam_enabled - Enable/Disable MAWC during roaming
+mawc_roam_enabled=0
+
+# Enable/Disable the Motion Aided Wireless Connectivity
+# based NLO using this parameter
+mawc_nlo_enabled=0
+
+# Enable/Disable rtt sta mac randomization
+enable_rtt_mac_randomization=1
+
+# Channel selection logic DBS (1) vs MCC (0)
+channel_select_logic_conc=0
+
+gConfigVCmode=0
+
+# WLM (Wireless Latency Manager)
+wlm_latency_flags_moderate=0
+wlm_latency_flags_low=0
+wlm_latency_flags_ultralow=0
+
+# OCE Feature
+oce_sta_enable=0
+oce_sap_enable=0
+num_oce_wan_slots=0
+oce_wan_score_idx7_to_4=0
+oce_wan_score_idx11_to_8=0
+oce_enable_rssi_assoc_reject=0
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/aosp_walleye.mk b/aosp_walleye.mk
index 80bb0d7..888c67d 100644
--- a/aosp_walleye.mk
+++ b/aosp_walleye.mk
@@ -25,12 +25,13 @@ $(call inherit-product-if-exists, vendor/google_devices/muskie/proprietary/devic
 PRODUCT_PACKAGES += \
     netutils-wrapper-1.0 \
     Dialer \
-    Launcher3 \
+    Launcher3QuickStep \
     WallpaperPicker \
     vndk_package
 
 PRODUCT_COPY_FILES += \
-    device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
+    device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+    frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
 PRODUCT_RESTRICT_VENDOR_FILES := owner
 
diff --git a/audio_effects.xml b/audio_effects.xml
index 704e53c..ea4a900 100644
--- a/audio_effects.xml
+++ b/audio_effects.xml
@@ -6,6 +6,7 @@
         <library name="visualizer_sw" path="libvisualizer.so"/>
         <library name="visualizer_hw" path="libqcomvisualizer.so"/>
         <library name="downmix" path="libdownmix.so"/>
+        <library name="dynamics_processing" path="libdynproc.so"/>
         <library name="loudness_enhancer" path="libldnhncr.so"/>
         <library name="proxy" path="libeffectproxy.so"/>
         <library name="offload_bundle" path="libqcompostprocbundle.so"/>
@@ -55,6 +56,7 @@
         <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>
         <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
+        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
     </effects>
     <postprocess>
         <stream type="music">
diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index f8c5f66..0194019 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -75,6 +75,7 @@
         <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="4" />
         <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
         <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
+        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
@@ -101,7 +102,9 @@
         <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO" backend="speaker-and-bt-sco" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
     </backend_names>
     <gain_db_to_level_mapping>
         <gain_level_map db="-70" level="5"/>
@@ -118,5 +121,59 @@
       <app uc_type="PCM_CAPTURE"  mode="default" bit_width="24" id="69940" max_rate="96000" />
       <app uc_type="PCM_CAPTURE"  mode="voip" bit_width="16" id="69945" max_rate="48000" />
     </app_types>
+    <microphone_characteristics>
+        <microphone valid_mask="31" device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+            group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
+            frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
+            responses="-0.23 -0.26 -0.09 -0.28 -0.46 -0.32 -0.06 0.10 -0.28 -0.41 -0.07 0.21 0.34 0.30 0.25 0.15 0.06 0.07 0.22 0.31 0.45 0.63 0.97 1.21 0.86 0.65 0.74 0.80 0.85 1.06 1.38 1.14 0.77 1.31 1.54 1.63 1.74 1.71 1.52 1.43 1.53 1.99 2.00 1.63 1.75 1.44 1.11 1.21 0.77 0.83 0.89 0.72 0.40 0.70 0.45 0.28 0.62 0.14 0.58 0.37 -0.11 -0.44 0.09 -0.65 -0.58 -0.28 -0.26 0.37 0.58 1.32 1.21 2.02 2.06 2.61 2.57 3.16 3.02 2.87 2.88 2.68 2.65 2.34 2.39 2.54 2.48 1.65 1.14 0.70 0.89 0.19 -0.62 -0.82 -1.17 -1.16 -1.26 -0.66 0.27 0.48 1.28 1.53 1.93 2.14 2.37 1.95 1.60 1.87 1.50 1.71 0.98 0.83 0.08 0.20 0.30 0.64 0.50 0.53 1.18 1.59 1.73 1.64 2.32 1.66 0.61 0.19 0.56 1.85 0.85 1.58 1.92 2.43 1.99 3.69 2.60 1.52 0.76 -0.41 0.24 1.43 0.74 2.95 3.42 4.31 5.74 3.68 3.30 2.89 4.54 4.18 2.47 0.86 -0.55 -1.71 0.90 1.25 2.66 3.38 0.95 5.23 1.42 1.90 3.38 4.70 5.37 3.67 3.75 1.72 5.67 1.36 3.03 7.54 6.71 3.45 0.58 1.22 6.80 5.61 5.71 1.37 -2.06 4.23 5.43 3.43 0.46 2.00 4.63 3.30 3.09 2.44 3.93 4.73 5.21 5.52 5.90 4.01 5.06 5.48 8.03 9.33 5.17 4.77 6.23 6.26 6.78 6.95 6.29 8.82 5.60 4.80 2.16 6.09 2.90 6.41 7.52 7.85 6.48 5.12 6.13 7.79 5.50 9.06 7.82 9.98 9.14 10.36 9.29 9.01 6.95 10.98 11.82 12.02 11.49 13.30 11.53 12.65 13.53 12.21 12.64 14.07 14.12 14.71 15.08 16.27 17.73 17.54 18.24 16.64 17.24 17.17 16.96 16.25 18.65 17.64 14.89 15.97 32.20 19.96"
+            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0225 0.0081 0.0078" />
+        <microphone valid_mask="31" device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+            group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
+            frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
+            responses="0.26 0.06 -0.08 -0.16 -0.05 0.01 0.17 0.42 0.14 -0.12 -0.10 0.03 0.10 0.10 0.15 0.19 0.22 0.30 0.32 0.38 0.58 0.65 0.66 0.67 0.70 0.72 0.71 0.67 0.64 0.64 0.62 0.58 0.69 1.18 1.43 1.56 1.62 1.62 1.47 1.38 1.29 1.20 1.16 1.08 1.02 0.97 0.90 1.00 0.92 0.93 1.00 0.89 0.83 0.75 0.66 0.52 0.42 0.34 0.14 0.08 -0.02 -0.13 -0.31 -0.26 -0.29 -0.25 -0.20 -0.09 0.14 0.40 0.68 0.91 1.33 1.54 1.66 1.70 1.58 1.47 1.43 1.23 1.14 0.95 0.76 0.56 0.49 0.46 0.55 0.79 0.83 0.72 0.39 -0.08 -0.53 -1.12 -1.54 -1.45 -1.04 -0.31 0.45 0.97 1.28 1.32 1.06 0.89 0.85 1.03 0.97 1.17 1.22 0.87 0.42 0.00 -0.21 -0.30 -0.53 -0.44 -0.29 -0.08 -0.19 -0.13 0.47 1.50 1.52 1.02 0.65 1.49 1.34 1.33 1.61 1.67 1.25 1.44 0.98 1.00 -0.19 -0.70 0.55 2.94 3.57 3.66 4.40 4.83 5.15 4.47 4.13 3.09 3.07 2.74 2.90 2.69 2.24 -0.23 -1.56 -2.65 2.11 4.98 4.40 5.14 4.56 3.83 3.83 5.48 5.16 3.72 5.59 5.17 6.04 5.29 4.75 6.05 5.01 4.38 5.05 4.15 4.29 6.15 5.19 3.46 2.81 3.79 7.34 7.00 4.97 6.03 7.99 7.16 6.91 6.88 8.80 9.80 8.47 9.28 11.02 10.61 8.48 10.60 11.31 8.03 12.39 13.00 11.19 13.69 15.42 14.80 15.64 17.39 15.16 18.50 19.69 20.50 22.19 24.75 27.10 26.67 23.02 23.53 21.02 19.62 15.29 15.92 14.64 14.70 13.45 14.84 16.10 12.79 10.10 11.98 10.10 10.43 11.41 9.03 6.82 8.51 8.93 8.36 9.46 10.04 10.97 10.47 7.52 7.22 6.89 7.20 7.59 7.79 6.69 7.30 7.55 8.43 9.19 10.27 8.05 7.88 18.67 11.77"
+            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0212 0.1457 0.0041" />
+        <microphone valid_mask="31" device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+            group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256"
+            frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98"
+            responses="-1.45 -1.74 -1.62 -1.75 -1.67 -1.48 -1.69 -1.91 -1.82 -1.75 -1.49 -1.36 -1.35 -1.27 -1.19 -1.19 -1.09 -1.11 -1.27 -1.27 -1.11 -0.83 -0.56 -0.57 -0.58 -0.47 -0.51 -0.57 -0.63 -0.64 -0.55 -0.68 -0.76 0.01 0.32 0.41 0.29 0.43 0.12 -0.14 0.23 0.16 0.18 0.09 -0.02 -0.14 -0.12 -0.40 -0.43 -0.15 -0.21 -0.42 -0.54 -0.33 -0.46 -0.80 -0.66 -0.71 -0.77 -0.96 -1.28 -1.32 -1.27 -1.37 -1.49 -1.47 -1.43 -1.28 -1.11 -0.79 -0.72 -0.45 0.30 0.47 0.90 0.95 0.95 0.94 0.75 0.65 0.83 0.24 0.11 0.00 0.08 -0.13 -0.44 0.18 0.43 0.43 0.18 0.00 -0.31 -0.80 -1.14 -0.72 -0.76 -0.50 -0.08 0.25 0.88 0.75 0.79 0.66 0.63 0.68 0.52 0.87 1.03 0.67 0.14 0.10 0.17 0.37 0.45 0.33 0.13 0.26 0.42 0.74 1.24 2.22 1.95 1.79 1.46 2.64 2.69 1.25 2.12 2.39 3.18 3.51 3.19 3.16 2.61 2.39 3.43 4.79 5.43 6.08 7.01 7.05 5.81 5.07 4.19 3.89 3.46 3.45 3.20 3.52 4.61 4.17 4.05 4.68 4.64 5.46 6.00 7.41 6.59 5.77 6.67 7.74 5.93 6.17 8.07 7.02 9.90 7.96 6.70 8.76 9.04 7.09 8.24 8.27 9.35 6.82 5.38 6.28 6.10 8.48 6.25 6.74 5.10 7.17 7.83 3.66 5.75 7.68 6.52 7.64 9.37 8.45 10.19 10.18 9.60 9.90 10.89 10.56 12.34 10.02 12.48 9.36 12.95 10.50 10.50 11.81 10.16 8.86 8.92 9.29 9.84 12.21 12.31 13.39 11.54 12.38 12.10 13.03 10.77 13.94 14.73 15.59 15.73 17.14 17.77 15.20 14.12 15.84 13.98 17.79 19.86 18.31 17.22 17.24 16.79 15.97 16.11 15.90 17.19 17.55 15.84 13.70 16.01 15.66 14.27 15.13 15.95 14.48 14.71 14.88 15.13 13.25 13.74 10.18 9.94 11.96"
+            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0353 0.1361 0.0078" />
+    </microphone_characteristics>
+    <!-- TODO: Fake channel mapping data, need to populate with actual data -->
+    <snd_devices>
+        <input_snd_device>
+            <input_snd_device_mic_mapping>
+                <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC">
+                    <mic_info mic_device_id="builtin_mic_1"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                </snd_dev>
+                <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS">
+                    <mic_info mic_device_id="builtin_mic_1"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    <mic_info mic_device_id="builtin_mic_2"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                </snd_dev>
+                <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC_TMUS">
+                    <mic_info mic_device_id="builtin_mic_1"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    <mic_info mic_device_id="builtin_mic_3"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                </snd_dev>
+                <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC">
+                    <mic_info mic_device_id="builtin_mic_1"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                    <mic_info mic_device_id="builtin_mic_3"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                </snd_dev>
+                <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC">
+                    <mic_info mic_device_id="builtin_mic_1"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    <mic_info mic_device_id="builtin_mic_2"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                    <mic_info mic_device_id="builtin_mic_3"
+                        channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+                </snd_dev>
+            </input_snd_device_mic_mapping>
+        </input_snd_device>
+    </snd_devices>
 </audio_platform_info>
 
diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml
index dbeb268..2445840 100644
--- a/audio_policy_volumes.xml
+++ b/audio_policy_volumes.xml
@@ -50,6 +50,8 @@ volume index from 0 to 100.
         <point>86,-550</point>
         <point>100,0</point>
     </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                             ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>1,-3000</point>
         <point>33,-2600</point>
@@ -62,6 +64,8 @@ volume index from 0 to 100.
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                          ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                         ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -74,6 +78,8 @@ volume index from 0 to 100.
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                        ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -92,18 +98,22 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+                                        ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4680</point>
+        <point>0,-4680</point>
         <point>42,-2070</point>
         <point>85,-540</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+                                        ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+                                        ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                        ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -116,6 +126,8 @@ volume index from 0 to 100.
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                                ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                               ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>0,-4200</point>
         <point>33,-2800</point>
@@ -136,6 +148,8 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                                 ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>1,-3000</point>
         <point>33,-2600</point>
@@ -148,6 +162,8 @@ volume index from 0 to 100.
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                                    ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                                   ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>1,-3000</point>
         <point>33,-2600</point>
@@ -160,6 +176,8 @@ volume index from 0 to 100.
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                        ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                       ref="SILENT_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -168,14 +186,18 @@ volume index from 0 to 100.
                                       ref="SILENT_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                       ref="SILENT_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                      ref="SILENT_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+                                                ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                                ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -184,6 +206,8 @@ volume index from 0 to 100.
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -192,5 +216,7 @@ volume index from 0 to 100.
                                         ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                         ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
 </volumes>
 
diff --git a/device-common.mk b/device-common.mk
index 130ff75..35126e3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -28,6 +28,8 @@ PRODUCT_PROPERTY_OVERRIDES += vendor.audio.adm.buffering.ms=3
 PRODUCT_PROPERTY_OVERRIDES += audio_hal.period_multiplier=2
 PRODUCT_PROPERTY_OVERRIDES += af.fast_track_multiplier=1
 
+# Whether by default, the eSIM system UI, including that in SUW and Settings, will be shown.
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += esim.enable_esim_system_ui_by_default=false
 
 # Pro audio feature
 PRODUCT_COPY_FILES += \
@@ -67,7 +69,8 @@ endif
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/init-common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-$(PRODUCT_HARDWARE).rc \
     $(LOCAL_PATH)/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).usb.rc \
-    $(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
+    $(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \
+    $(LOCAL_PATH)/init.insmod_charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod_charger.cfg
 
 # Input device files
 PRODUCT_COPY_FILES += \
@@ -82,20 +85,63 @@ BOARD_VENDOR_KERNEL_MODULES += \
     device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \
     device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \
     device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \
-    device/google/wahoo-kernel/gcc/htc_battery.ko
+    device/google/wahoo-kernel/gcc/htc_battery.ko \
+    device/google/wahoo-kernel/gcc/wlan.ko
 else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT)))
 # if TARGET_PRODUCT == *_kasan
 BOARD_VENDOR_KERNEL_MODULES += \
     device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \
     device/google/wahoo-kernel/kasan/synaptics_dsx_rmi_dev_htc.ko \
     device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \
-    device/google/wahoo-kernel/kasan/htc_battery.ko
+    device/google/wahoo-kernel/kasan/htc_battery.ko \
+    device/google/wahoo-kernel/kasan/wlan.ko
+else ifeq (,$(filter-out walleye_kcfi, $(TARGET_PRODUCT)))
+# if TARGET_PRODUCT == *_kcfi
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/kcfi/synaptics_dsx_core_htc.ko \
+    device/google/wahoo-kernel/kcfi/synaptics_dsx_rmi_dev_htc.ko \
+    device/google/wahoo-kernel/kcfi/synaptics_dsx_fw_update_htc.ko \
+    device/google/wahoo-kernel/kcfi/htc_battery.ko \
+    device/google/wahoo-kernel/kcfi/wlan.ko
+else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT)))
+# if TARGET == walleye_kernel_debug_memory
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/debug_memory/synaptics_dsx_core_htc.ko \
+    device/google/wahoo-kernel/debug_memory/synaptics_dsx_rmi_dev_htc.ko \
+    device/google/wahoo-kernel/debug_memory/synaptics_dsx_fw_update_htc.ko \
+    device/google/wahoo-kernel/debug_memory/htc_battery.ko \
+    device/google/wahoo-kernel/debug_memory/wlan.ko
+else ifeq (,$(filter-out walleye_kernel_debug_locking, $(TARGET_PRODUCT)))
+# if TARGET == walleye_kernel_debug_locking
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/debug_locking/synaptics_dsx_core_htc.ko \
+    device/google/wahoo-kernel/debug_locking/synaptics_dsx_rmi_dev_htc.ko \
+    device/google/wahoo-kernel/debug_locking/synaptics_dsx_fw_update_htc.ko \
+    device/google/wahoo-kernel/debug_locking/htc_battery.ko \
+    device/google/wahoo-kernel/debug_locking/wlan.ko
+else ifeq (,$(filter-out walleye_kernel_debug_hang, $(TARGET_PRODUCT)))
+# if TARGET == walleye_kernel_debug_hang
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/debug_hang/synaptics_dsx_core_htc.ko \
+    device/google/wahoo-kernel/debug_hang/synaptics_dsx_rmi_dev_htc.ko \
+    device/google/wahoo-kernel/debug_hang/synaptics_dsx_fw_update_htc.ko \
+    device/google/wahoo-kernel/debug_hang/htc_battery.ko \
+    device/google/wahoo-kernel/debug_hang/wlan.ko
+else ifeq (,$(filter-out walleye_kernel_debug_api, $(TARGET_PRODUCT)))
+# if TARGET == walleye_kernel_debug_api
+BOARD_VENDOR_KERNEL_MODULES += \
+    device/google/wahoo-kernel/debug_api/synaptics_dsx_core_htc.ko \
+    device/google/wahoo-kernel/debug_api/synaptics_dsx_rmi_dev_htc.ko \
+    device/google/wahoo-kernel/debug_api/synaptics_dsx_fw_update_htc.ko \
+    device/google/wahoo-kernel/debug_api/htc_battery.ko \
+    device/google/wahoo-kernel/debug_api/wlan.ko
 else
 BOARD_VENDOR_KERNEL_MODULES += \
     device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \
     device/google/wahoo-kernel/synaptics_dsx_rmi_dev_htc.ko \
     device/google/wahoo-kernel/synaptics_dsx_fw_update_htc.ko \
-    device/google/wahoo-kernel/htc_battery.ko
+    device/google/wahoo-kernel/htc_battery.ko \
+    device/google/wahoo-kernel/wlan.ko
 endif
 
 PRODUCT_COPY_FILES += \
diff --git a/init-common.rc b/init-common.rc
index ca1f526..356c9d8 100644
--- a/init-common.rc
+++ b/init-common.rc
@@ -42,3 +42,9 @@ on init && property:ro.boot.revision=MP1
 
 on boot && property:ro.build.type=userdebug
    write /sys/class/uio/uio1/device/rtel/rtel 1
+
+on property:persist.vendor.charge.stop.level=* && property:sys.all.modules.ready=1
+    write /sys/module/htc_battery/parameters/charge_stop_level ${persist.vendor.charge.stop.level}
+
+on property:persist.vendor.charge.start.level=* && property:sys.all.modules.ready=1
+    write /sys/module/htc_battery/parameters/charge_start_level ${persist.vendor.charge.start.level}
diff --git a/init.common.usb.rc b/init.common.usb.rc
index 629f0f6..19e93d1 100644
--- a/init.common.usb.rc
+++ b/init.common.usb.rc
@@ -3,11 +3,3 @@ import /vendor/etc/init/hw/init.wahoo.usb.rc
 on boot && property:ro.bootmode=usbradio && property:persist.sys.usb.usbradio.config=*
     setprop sys.usb.config "none"
     setprop sys.usb.config ${persist.sys.usb.usbradio.config}
-
-# battery driver settings for the retail demo environment where
-# the device will be perpertually plugged in to a power source
-on property:sys.retaildemo.enabled=1
-    write /sys/module/htc_battery/parameters/full_level_dis_chg 35
-
-on property:sys.retaildemo.enabled=0
-    write /sys/module/htc_battery/parameters/full_level_dis_chg 100
diff --git a/init.insmod.cfg b/init.insmod.cfg
index 6d2b325..082948c 100644
--- a/init.insmod.cfg
+++ b/init.insmod.cfg
@@ -2,3 +2,4 @@ insmod /vendor/lib/modules/synaptics_dsx_core_htc.ko
 insmod /vendor/lib/modules/synaptics_dsx_fw_update_htc.ko
 insmod /vendor/lib/modules/synaptics_dsx_rmi_dev_htc.ko
 insmod /vendor/lib/modules/htc_battery.ko
+insmod /vendor/lib/modules/wlan.ko
diff --git a/init.insmod_charger.cfg b/init.insmod_charger.cfg
new file mode 100644
index 0000000..e3d267d
--- /dev/null
+++ b/init.insmod_charger.cfg
@@ -0,0 +1,2 @@
+insmod /vendor/lib/modules/htc_battery.ko
+
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 51a2786..c568445 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -84,8 +84,10 @@
     <ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
     <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
+    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="0" />
@@ -117,6 +119,8 @@
     <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
     <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
     <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
+    <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="0" />
+    <ctl name="MultiMedia2 Mixer SLIM_7_TX" value="0" />
     <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
     <ctl name="HDMI Mixer MultiMedia1" value="0" />
     <ctl name="HDMI Mixer MultiMedia2" value="0" />
@@ -197,7 +201,6 @@
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
     <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
-    <ctl name="MultiMedia3 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
@@ -210,6 +213,7 @@
     <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
     <ctl name="MultiMedia10 Mixer SLIM_0_TX" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
@@ -489,6 +493,7 @@
 
     <!-- Incall Music -->
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
+    <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
     <!-- Incall Music End -->
 
     <!-- compress-voip-call start -->
@@ -518,12 +523,6 @@
     <ctl name="VoWLAN_Tx Mixer USB_AUDIO_TX_VoWLAN" value="0" />
     <!-- VoWLAN end-->
 
-    <!-- Audio BTSCO -->
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia6" value="0" />
-    <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
     <!-- IIR/voice anc -->
     <ctl name="IIR0 Band1" id ="0" value="268435456" />
     <ctl name="IIR0 Band1" id ="1" value="0" />
@@ -614,6 +613,13 @@
 
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
 
+    <!-- mmap record init -->
+    <ctl name="MultiMedia3 Mixer SLIM_0_TX" value="0" />
+    <ctl name="MultiMedia3 Mixer AUX_PCM_UL_TX" value="0" />
+    <ctl name="MultiMedia3 Mixer TERT_MI2S_TX" value="0" />
+    <ctl name="MultiMedia3 Mixer USB_AUDIO_TX" value="0" />
+    <!-- mmap record init end -->
+
     <!-- Speaker swap -->
     <ctl name="Swap channel" value="0" />
 
@@ -856,10 +862,31 @@
       <path name="audio-ull-playback bt-sco-wb"  />
     </path>
 
+    <path name="hifi-playback">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+    </path>
+
+    <path name="hifi-playback speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+    </path>
+
+    <path name="hifi-playback handset">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
+    </path>
+
     <path name="hifi-playback display-port">
         <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
     </path>
 
+    <path name="hifi-playback bt-sco">
+        <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia2" value="1" />
+    </path>
+
+    <path name="hifi-playback bt-sco-wb">
+        <ctl name="BT SampleRate" value="KHZ_16" />
+        <path name="hifi-playback bt-sco" />
+    </path>
+
     <path name="hifi-playback afe-proxy">
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
     </path>
@@ -872,10 +899,23 @@
         <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />
     </path>
 
+    <path name="hifi-record">
+        <ctl name="MultiMedia2 Mixer SLIM_0_TX" value="1" />
+    </path>
+
     <path name="hifi-record usb-headset-mic">
         <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />
     </path>
 
+    <path name="hifi-record bt-sco">
+        <ctl name="MultiMedia2 Mixer SLIM_7_TX" value="1" />
+    </path>
+
+    <path name="hifi-record bt-sco-wb">
+        <ctl name="BT SampleRate" value="KHZ_16" />
+        <path name="hifi-record bt-sco" />
+    </path>
+
     <path name="compress-offload-playback">
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
     </path>
@@ -954,6 +994,10 @@
         <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="1" />
     </path>
 
+    <path name="mmap-playback handset">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="1" />
+    </path>
+
     <path name="mmap-playback speaker-and-headphones">
         <path name="mmap-playback speaker" />
         <path name="mmap-playback" />
@@ -1818,6 +1862,26 @@
         <path name="handset-mic" />
     </path>
 
+    <path name="speaker-and-bt-sco">
+        <path name="speaker"/>
+        <path name="bt-sco-headset"/>
+    </path>
+
+    <path name="speaker-and-bt-sco-wb">
+        <path name="speaker"/>
+        <path name="bt-sco-headset-wb"/>
+    </path>
+
+    <path name="speaker-safe-and-bt-sco">
+        <path name="speaker-safe"/>
+        <path name="bt-sco-headset"/>
+    </path>
+
+    <path name="speaker-safe-and-bt-sco-wb">
+        <path name="speaker-safe"/>
+        <path name="bt-sco-headset-wb"/>
+    </path>
+
     <path name="bt-sco-headset">
     </path>
 
@@ -2078,4 +2142,77 @@
       <ctl name="BT SampleRate" value="KHZ_16" />
       <path name="audio-record-voip bt-sco" />
     </path>
+
+    <path name="incall-music-uplink">
+        <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />
+    </path>
+
+    <path name="incall-music-uplink speaker">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink handset">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink handset-hac">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink display-port">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink bt-sco">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink bt-sco-wb">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink speaker-and-display-port">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink afe-proxy">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink usb-headphones">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink usb-headset">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink speaker-and-usb-headphones">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink headphones">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink speaker-and-headphones">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink speaker-and-bt-sco">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink voice-tty-hco-handset">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink speaker-and-bt-a2dp">
+        <path name="incall-music-uplink" />
+    </path>
+
+    <path name="incall-music-uplink bt-a2dp">
+        <path name="incall-music-uplink" />
+    </path>
+
 </mixer>
diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf
index cb906b9..d1e530e 100644
--- a/nfc/libnfc-nxp.muskie.conf
+++ b/nfc/libnfc-nxp.muskie.conf
@@ -73,7 +73,7 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 01,
 ###############################################################################
 #config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM,
 #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms
-NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 18, 00, D0, 0C}
+NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, 82, B2, 00, BA, 1E, 18, 00, D0, 0C}
 
 ###############################################################################
 # NXP RF configuration ALM/PLM settings
diff --git a/sepolicy/OWNERS b/sepolicy/OWNERS
new file mode 100644
index 0000000..4bd7e34
--- /dev/null
+++ b/sepolicy/OWNERS
@@ -0,0 +1,6 @@
+nnk@google.com
+jeffv@google.com
+klyubin@google.com
+dcashman@google.com
+jbires@google.com
+sspatil@google.com
diff --git a/walleye/AndroidBoard.mk b/walleye/AndroidBoard.mk
new file mode 120000
index 0000000..c0a3afc
--- /dev/null
+++ b/walleye/AndroidBoard.mk
@@ -0,0 +1 @@
+../AndroidBoard.mk
\ No newline at end of file
diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
index ba4da0a..8fafad7 100644
--- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml
@@ -40,50 +40,113 @@
 
          Must be overridden in platform specific overlays -->
     <integer-array name="config_autoBrightnessLevels">
-        <item>5</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>8</item>
+        <item>12</item>
         <item>20</item>
-        <item>40</item>
-        <item>100</item>
-        <item>325</item>
-        <item>600</item>
-        <item>1250</item>
-        <item>2200</item>
-        <item>4000</item>
+        <item>33</item>
+        <item>55</item>
+        <item>90</item>
+        <item>148</item>
+        <item>245</item>
+        <item>403</item>
+        <item>665</item>
+        <item>1097</item>
+        <item>1808</item>
+        <item>2981</item>
+        <item>5000</item>
     </integer-array>
 
-    <!-- Array of output values for LCD backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
-         than the size of the config_autoBrightnessLevels array.
-         This must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLcdBacklightValues">
-        <item>10</item>   <!-- 0-5 -->
-        <item>33</item>   <!-- 5-20 -->
-        <item>49</item>   <!-- 20-40 -->
-        <item>68</item>   <!-- 40-100 -->
-        <item>87</item>   <!-- 100-325 -->
-        <item>108</item>  <!-- 325-600 -->
-        <item>132</item>  <!-- 600-1250 -->
-        <item>167</item>  <!-- 1250-2200 -->
-        <item>206</item>  <!-- 2200-4000 -->
-        <item>255</item>  <!-- 4000+ -->
+    <!-- Array of desired screen brightness in nits corresponding to the lux values
+         in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
+         config_screenBrightnessMaximumNits, the display brightness is defined as the measured
+         brightness of an all-white image.
+
+         If this is defined then:
+            - config_autoBrightnessLcdBacklightValues should not be defined
+            - config_screenBrightnessNits must be defined
+            - config_screenBrightnessBacklight must be defined
+
+         This array should have size one greater than the size of the config_autoBrightnessLevels
+         array. The brightness values must be non-negative and non-decreasing. This must be
+         overridden in platform specific overlays -->
+    <array name="config_autoBrightnessDisplayValuesNits">
+        <item>14.22825</item>   <!-- 0-1 -->
+        <item>17.92821</item>   <!-- 1-2 -->
+        <item>21.0392</item>    <!-- 2-3 -->
+        <item>23.454172</item>  <!-- 3-4 -->
+        <item>25.448406</item>  <!-- 4-8 -->
+        <item>31.200361</item>  <!-- 8-12 -->
+        <item>35.231995</item>  <!-- 12-20 -->
+        <item>41.076897</item>  <!-- 20-33 -->
+        <item>47.72592</item>   <!-- 33-55 -->
+        <item>55.562805</item>  <!-- 55-90 -->
+        <item>64.97754</item>   <!-- 90-148 -->
+        <item>77.0652</item>    <!-- 148-245 -->
+        <item>94.4501</item>    <!-- 245-403 -->
+        <item>117.607216</item> <!-- 403-665 -->
+        <item>149.78299</item>  <!-- 665-1097 -->
+        <item>197.58708</item>  <!-- 1097-1808 -->
+        <item>254.74942</item>  <!-- 1808-2981 -->
+        <item>320.71716</item>  <!-- 2981-5000 -->
+        <item>395.74274</item>  <!-- 5000+ -->
+    </array>
+
+    <!-- An array describing the screen's backlight values corresponding to the brightness
+         values in the config_screenBrightnessNits array.
+
+         This array should be equal in size to config_screenBrightnessBacklight. -->
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>0</item>
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+        <item>60</item>
+        <item>75</item>
+        <item>90</item>
+        <item>105</item>
+        <item>120</item>
+        <item>135</item>
+        <item>150</item>
+        <item>165</item>
+        <item>180</item>
+        <item>195</item>
+        <item>210</item>
+        <item>225</item>
+        <item>240</item>
+        <item>255</item>
     </integer-array>
 
-    <!-- Array of output values for button backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
-         than the size of the config_autoBrightnessLevels array.
-         This must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessButtonBacklightValues">
+    <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
+         values in the config_screenBrightnessBacklight array.  On OLED displays these  values
+         should be measured with an all white image while the display is in the fully on state.
+         Note that this value should *not* reflect the maximum brightness value for any high
+         brightness modes but only the maximum brightness value obtainable in a sustainable manner.
+
+         This array should be equal in size to config_screenBrightnessBacklight -->
+    <array name="config_screenBrightnessNits">
         <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-        <item>0</item>
-    </integer-array>
+        <item>26.11</item>
+        <item>50.5</item>
+        <item>74.17</item>
+        <item>96.89</item>
+        <item>118.3</item>
+        <item>139.8</item>
+        <item>162.9</item>
+        <item>189.8</item>
+        <item>217.4</item>
+        <item>240.4</item>
+        <item>265.3</item>
+        <item>288.7</item>
+        <item>316</item>
+        <item>340.8</item>
+        <item>357.9</item>
+        <item>376.2</item>
+        <item>392.9</item>
+    </array>
 
     <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
     <integer name="config_shutdownBatteryTemperature">600</integer>
@@ -100,7 +163,7 @@
 
     <!-- Minimum screen brightness setting allowed by the power manager.
          The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">4</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
     <!-- Values for USB port setting. in format of bootmode:current function:new function -->
     <string-array translatable="false" name="config_oemUsbModeOverride">
@@ -111,8 +174,26 @@
         <item>"usbradio:rndis:rndis,diag:diag,serial_cdev,rmnet_gsi"</item>
     </string-array>
 
+    <!-- Vibrator pattern for feedback about a long screen/key press -->
+    <integer-array name="config_longPressVibePattern">
+        <item>8</item>
+    </integer-array>
+
     <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR requirements
          during voice calls -->
     <bool translatable="false" name="config_wifi_framework_enable_voice_call_sar_tx_power_limit">true</bool>
 
+    <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+
+    <!-- If true, the doze component is not started until after the screen has been
+         turned off and the screen off animation has been performed. -->
+    <bool name="config_dozeAfterScreenOff">true</bool>
+
+    <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
+    <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
+
+    <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
+    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
+
 </resources>
diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 8cc203e..a7b93b9 100644
--- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -17,10 +17,7 @@
 */
 -->
 <device name="Android">
-    <!-- All values are in mAh except as noted -->
-
-    <!-- Nothing -->
-    <item name="none">0</item>
+    <!-- All values are in mA except as noted -->
 
     <!-- This is the battery capacity in mAh -->
     <item name="battery.capacity">2700</item>
@@ -32,13 +29,24 @@
     </array>
 
     <!-- Power consumption when CPU is suspended -->
-    <item name="cpu.idle">6.815</item>
+    <item name="cpu.suspend">6.815</item>
     <!-- Additional power consumption when CPU is in a kernel idle loop -->
-    <item name="cpu.awake">0.386</item>
+    <item name="cpu.idle">0.386</item>
+
+    <!-- Additional power consumption by CPU excluding cluster and core when
+         running -->
+    <item name="cpu.active">17.757</item>
+
+    <!-- Additional power consumption by CPU cluster0 itself when running
+         excluding cores in it -->
+    <item name="cpu.cluster_power.cluster0">6.478</item>
+    <!-- Additional power consumption by CPU cluster1 itself when running
+         excluding cores in it -->
+    <item name="cpu.cluster_power.cluster1">6.141</item>
 
     <!-- Different CPU speeds as reported in
          /sys/devices/system/cpu/cpu0/cpufreq/stats/scaling_available_frequencies -->
-    <array name="cpu.speeds.cluster0">
+    <array name="cpu.core_speeds.cluster0">
         <value>300000</value> <!-- 300 MHz CPU speed -->
         <value>364800</value> <!-- 364 MHz CPU speed -->
         <value>441600</value> <!-- 441 MHz CPU speed -->
@@ -64,7 +72,7 @@
     </array>
     <!-- Different CPU speeds as reported in
          /sys/devices/system/cpu/cpu4/cpufreq/stats/scaling_available_frequencies -->
-    <array name="cpu.speeds.cluster1">
+    <array name="cpu.core_speeds.cluster1">
         <value>300000</value> <!-- 300 MHz CPU speed -->
         <value>345600</value> <!-- 345 MHz CPU speed -->
         <value>422400</value> <!-- 422 MHz CPU speed -->
@@ -98,68 +106,71 @@
         <value>2457600</value> <!-- 2457 MHz CPU speed -->
     </array>
 
-    <!-- Additional power used by a CPU from cluster 0 when running at different
-         speeds. Currently this measurement also includes cluster cost. -->
-    <array name="cpu.active.cluster0">
-        <value>94.160</value> <!-- 300 MHz CPU speed -->
-        <value>93.476</value> <!-- 364 MHz CPU speed -->
-        <value>94.298</value> <!-- 441 MHz CPU speed -->
-        <value>94.855</value> <!-- 518 MHz CPU speed -->
-        <value>95.562</value> <!-- 595 MHz CPU speed -->
-        <value>96.226</value> <!-- 672 MHz CPU speed -->
-        <value>97.122</value> <!-- 748 MHz CPU speed -->
-        <value>97.846</value> <!-- 825 MHz CPU speed -->
-        <value>98.628</value> <!-- 883 MHz CPU speed -->
-        <value>100.261</value> <!-- 960 MHz CPU speed -->
-        <value>101.152</value> <!-- 1036 MHz CPU speed -->
-        <value>102.414</value> <!-- 1094 MHz CPU speed -->
-        <value>103.788</value> <!-- 1171 MHz CPU speed -->
-        <value>105.495</value> <!-- 1248 MHz CPU speed -->
-        <value>107.019</value> <!-- 1324 MHz CPU speed -->
-        <value>107.988</value> <!-- 1401 MHz CPU speed -->
-        <value>109.419</value> <!-- 1478 MHz CPU speed -->
-        <value>112.277</value> <!-- 1555 MHz CPU speed -->
-        <value>115.216</value> <!-- 1670 MHz CPU speed -->
-        <value>120.171</value> <!-- 1747 MHz CPU speed -->
-        <value>121.103</value> <!-- 1824 MHz CPU speed -->
-        <value>127.612</value> <!-- 1900 MHz CPU speed -->
+    <!-- Additional power used by a CPU core from cluster 0 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster0">
+        <value>3.685</value> <!-- 300 MHz CPU speed -->
+        <value>3.598</value> <!-- 364 MHz CPU speed -->
+        <value>3.621</value> <!-- 441 MHz CPU speed -->
+        <value>4.202</value> <!-- 518 MHz CPU speed -->
+        <value>4.935</value> <!-- 595 MHz CPU speed -->
+        <value>5.633</value> <!-- 672 MHz CPU speed -->
+        <value>6.216</value> <!-- 748 MHz CPU speed -->
+        <value>6.710</value> <!-- 825 MHz CPU speed -->
+        <value>7.557</value> <!-- 883 MHz CPU speed -->
+        <value>8.687</value> <!-- 960 MHz CPU speed -->
+        <value>9.882</value> <!-- 1036 MHz CPU speed -->
+        <value>10.950</value> <!-- 1094 MHz CPU speed -->
+        <value>12.075</value> <!-- 1171 MHz CPU speed -->
+        <value>12.875</value> <!-- 1248 MHz CPU speed -->
+        <value>14.424</value> <!-- 1324 MHz CPU speed -->
+        <value>15.653</value> <!-- 1401 MHz CPU speed -->
+        <value>17.345</value> <!-- 1478 MHz CPU speed -->
+        <value>18.710</value> <!-- 1555 MHz CPU speed -->
+        <value>21.587</value> <!-- 1670 MHz CPU speed -->
+        <value>25.430</value> <!-- 1747 MHz CPU speed -->
+        <value>27.165</value> <!-- 1824 MHz CPU speed -->
+        <value>31.671</value> <!-- 1900 MHz CPU speed -->
     </array>
-    <!-- Additional power used by a CPU from cluster 1 when running at different
-         speeds. Currently this measurement also includes cluster cost. -->
-    <array name="cpu.active.cluster1">
-        <value>100.694</value> <!-- 300 MHz CPU speed -->
-        <value>101.776</value> <!-- 345 MHz CPU speed -->
-        <value>104.376</value> <!-- 422 MHz CPU speed -->
-        <value>107.662</value> <!-- 499 MHz CPU speed -->
-        <value>110.020</value> <!-- 576 MHz CPU speed -->
-        <value>112.200</value> <!-- 652 MHz CPU speed -->
-        <value>115.311</value> <!-- 729 MHz CPU speed -->
-        <value>117.869</value> <!-- 806 MHz CPU speed -->
-        <value>120.536</value> <!-- 902 MHz CPU speed -->
-        <value>124.278</value> <!-- 979 MHz CPU speed -->
-        <value>126.533</value> <!-- 1056 MHz CPU speed -->
-        <value>128.559</value> <!-- 1132 MHz CPU speed -->
-        <value>133.988</value> <!-- 1190 MHz CPU speed -->
-        <value>136.235</value> <!-- 1267 MHz CPU speed -->
-        <value>141.534</value> <!-- 1344 MHz CPU speed -->
-        <value>145.820</value> <!-- 1420 MHz CPU speed -->
-        <value>150.525</value> <!-- 1497 MHz CPU speed -->
-        <value>156.475</value> <!-- 1574 MHz CPU speed -->
-        <value>164.219</value> <!-- 1651 MHz CPU speed -->
-        <value>169.669</value> <!-- 1728 MHz CPU speed -->
-        <value>179.833</value> <!-- 1804 MHz CPU speed -->
-        <value>196.902</value> <!-- 1881 MHz CPU speed -->
-        <value>204.774</value> <!-- 1958 MHz CPU speed -->
-        <value>222.625</value> <!-- 2035 MHz CPU speed -->
-        <value>227.947</value> <!-- 2112 MHz CPU speed -->
-        <value>251.520</value> <!-- 2208 MHz CPU speed -->
-        <value>266.381</value> <!-- 2265 MHz CPU speed -->
-        <value>282.240</value> <!-- 2323 MHz CPU speed -->
-        <value>288.020</value> <!-- 2342 MHz CPU speed -->
-        <value>295.238</value> <!-- 2361 MHz CPU speed -->
-        <value>294.655</value> <!-- 2457 MHz CPU speed -->
+    <!-- Additional power used by a CPU core from cluster 1 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster1">
+        <value>10.722</value> <!-- 300 MHz CPU speed -->
+        <value>11.520</value> <!-- 345 MHz CPU speed -->
+        <value>14.105</value> <!-- 422 MHz CPU speed -->
+        <value>16.680</value> <!-- 499 MHz CPU speed -->
+        <value>18.946</value> <!-- 576 MHz CPU speed -->
+        <value>21.265</value> <!-- 652 MHz CPU speed -->
+        <value>23.432</value> <!-- 729 MHz CPU speed -->
+        <value>26.019</value> <!-- 806 MHz CPU speed -->
+        <value>28.856</value> <!-- 902 MHz CPU speed -->
+        <value>31.085</value> <!-- 979 MHz CPU speed -->
+        <value>33.615</value> <!-- 1056 MHz CPU speed -->
+        <value>35.760</value> <!-- 1132 MHz CPU speed -->
+        <value>40.608</value> <!-- 1190 MHz CPU speed -->
+        <value>43.284</value> <!-- 1267 MHz CPU speed -->
+        <value>47.347</value> <!-- 1344 MHz CPU speed -->
+        <value>52.231</value> <!-- 1420 MHz CPU speed -->
+        <value>57.225</value> <!-- 1497 MHz CPU speed -->
+        <value>63.138</value> <!-- 1574 MHz CPU speed -->
+        <value>69.251</value> <!-- 1651 MHz CPU speed -->
+        <value>76.449</value> <!-- 1728 MHz CPU speed -->
+        <value>84.710</value> <!-- 1804 MHz CPU speed -->
+        <value>102.551</value> <!-- 1881 MHz CPU speed -->
+        <value>107.115</value> <!-- 1958 MHz CPU speed -->
+        <value>129.689</value> <!-- 2035 MHz CPU speed -->
+        <value>135.832</value> <!-- 2112 MHz CPU speed -->
+        <value>164.674</value> <!-- 2208 MHz CPU speed -->
+        <value>180.279</value> <!-- 2265 MHz CPU speed -->
+        <value>197.024</value> <!-- 2323 MHz CPU speed -->
+        <value>204.511</value> <!-- 2342 MHz CPU speed -->
+        <value>211.886</value> <!-- 2361 MHz CPU speed -->
+        <value>212.147</value> <!-- 2457 MHz CPU speed -->
     </array>
 
+    <!-- Additional power used when screen is ambient mode -->
+    <item name="ambient.on">23.69</item>
+
     <!-- Additional power used when screen is turned on at minimum brightness -->
     <item name="screen.on">131.397</item>
     <!-- Additional power used when screen is at maximum brightness, compared to
@@ -174,24 +185,51 @@
          minute. -->
     <item name="camera.avg">895.907</item>
 
-    <!-- Additional power used when audio decoding/encoding via DSP -->
-    <item name="dsp.audio">55.714</item>
+    <!-- Additional power used when video is playing -->
+    <item name="video">21.29</item>
+    <!-- Additional power used when audio is playing -->
+    <item name="audio">74.758</item>
 
-    <!-- Additional power used when GPS is acquiring a signal -->
-    <item name="gps.on">30</item>
+    <!-- Idle current for wifi radio in mA.-->
+    <item name="wifi.controller.idle">2</item>
+    <!-- Rx current for wifi radio in mA.-->
+    <item name="wifi.controller.rx">166</item>
+    <!-- Tx current for wifi radio in mA-->
+    <item name="wifi.controller.tx">720</item>
+    <!-- Operating voltage for wifi radio in mV.-->
+    <item name="wifi.controller.voltage">3700</item>
 
-    <!-- Additional power used when cellular radio is transmitting/receiving -->
-    <item name="radio.active">50</item>
-    <!-- Additional power used when cellular radio is paging the tower -->
-    <item name="radio.scanning">5</item>
-    <!-- Additional power used when the cellular radio is on. Multi-value entry,
-         one per signal strength (no signal, weak, moderate, strong) -->
-    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
-        <value>6</value>      <!-- none -->
-        <value>5</value>      <!-- poor -->
-        <value>4</value>      <!-- moderate -->
-        <value>3</value>      <!-- good -->
-        <value>3</value>      <!-- great -->
+    <!-- Cellular modem related values.-->
+    <item name="modem.controller.sleep">0</item>
+    <!-- Idle current for modem in mA.-->
+    <item name="modem.controller.idle">145</item>
+    <!-- Rx current for modem in mA.-->
+    <item name="modem.controller.rx">147</item>
+    <!-- Tx current for modem in mA.-->
+    <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
+        <value>153</value>
+        <value>198</value>
+        <value>259</value>
+        <value>310</value>
+        <value>395</value>
     </array>
+    <!-- Operating voltage for modem in mV.-->
+    <item name="modem.controller.voltage">3700</item>
+
+    <!-- GPS related values.-->
+    <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
+        <value>49</value>
+        <value>8</value>
+    </array>
+    <item name="gps.voltage">3700</item>
+
+    <!-- Idle current for bluetooth in mA.-->
+    <item name="bluetooth.controller.idle">0.01</item>
+    <!-- Rx current for bluetooth in mA.-->
+    <item name="bluetooth.controller.rx">9</item>
+    <!-- Tx current for bluetooth in mA-->
+    <item name="bluetooth.controller.tx">7</item>
+    <!-- Operating voltage for bluetooth in mV.-->
+    <item name="bluetooth.controller.voltage">3300</item>
 
 </device>