diff --git a/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml b/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
index 027bcea8..969fd435 100644
--- a/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
+++ b/audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <xml>
-    <spec>
-        <vol step="1">-56.154594,-57.110912</vol>
-        <vol step="2">-53.155884,-54.127373</vol>
-        <vol step="3">-49.756584,-50.737946</vol>
-        <vol step="4">-46.936535,-47.922485</vol>
-        <vol step="5">-43.24405,-44.23973</vol>
-        <vol step="6">-39.813145,-40.822468</vol>
-        <vol step="7">-36.94418,-37.96505</vol>
-        <vol step="8">-34.103817,-35.12746</vol>
-        <vol step="9">-32.26378,-33.29418</vol>
-        <vol step="10">-30.093319,-31.127796</vol>
-        <vol step="11">-27.625238,-28.658443</vol>
-        <vol step="12">-25.123178,-26.156292</vol>
-        <vol step="13">-23.122547,-24.157629</vol>
-        <vol step="14">-21.27267,-22.309628</vol>
-        <vol step="15">-19.260181,-20.323017</vol>
-        <vol step="16">-17.789768,-18.920961</vol>
-        <vol step="17">-16.70663,-17.944777</vol>
-        <vol step="18">-15.632062,-16.883278</vol>
-        <vol step="19">-14.59099,-15.903705</vol>
-        <vol step="20">-13.215048,-14.563754</vol>
-        <vol step="21">-12.320514,-13.758759</vol>
-        <vol step="22">-11.425067,-12.607503</vol>
-        <vol step="23">-10.545513,-11.783849</vol>
-        <vol step="24">-9.59371,-10.908389</vol>
-        <vol step="25">-8.927933,-10.219385</vol>
+    <spec feature="normal">
+        <vol step="1">-55.633537,-57.12799</vol>
+        <vol step="2">-52.74118,-54.248005</vol>
+        <vol step="3">-49.229015,-50.760155</vol>
+        <vol step="4">-46.39415,-47.93267</vol>
+        <vol step="5">-42.696896,-44.252502</vol>
+        <vol step="6">-39.243034,-40.831715</vol>
+        <vol step="7">-36.365067,-37.983456</vol>
+        <vol step="8">-33.502815,-35.130657</vol>
+        <vol step="9">-31.668825,-33.308605</vol>
+        <vol step="10">-29.462334,-31.116865</vol>
+        <vol step="11">-26.979172,-28.646566</vol>
+        <vol step="12">-24.473492,-26.155708</vol>
+        <vol step="13">-22.479034,-24.18116</vol>
+        <vol step="14">-20.641127,-22.376537</vol>
+        <vol step="15">-18.619516,-20.410694</vol>
+        <vol step="16">-17.039654,-18.978006</vol>
+        <vol step="17">-15.964582,-18.063643</vol>
+        <vol step="18">-14.847198,-17.068687</vol>
+        <vol step="19">-13.786341,-16.13179</vol>
+        <vol step="20">-12.377989,-14.879541</vol>
+        <vol step="21">-11.468842,-14.155666</vol>
+        <vol step="22">-10.673872,-13.19977</vol>
+        <vol step="23">-9.866504,-12.5231495</vol>
+        <vol step="24">-9.465342,-12.234019</vol>
+        <vol step="25">-9.418919,-12.183332</vol>
     </spec>
-</xml>
\ No newline at end of file
+</xml>
+
diff --git a/manifest.xml b/manifest.xml
index e01d156c..18109c63 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index f557c4f1..8c246e13 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 1dddb841..34f7fc0d 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 81858c83..ea0edaed 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -222,7 +222,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -471,7 +470,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -511,7 +509,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index f557c4f1..8c246e13 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -170,7 +170,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -483,7 +482,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -523,7 +521,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {