Merge cherrypicks of [16191708] into sc-qpr1-d-release.
Change-Id: I71fbaad5cb9b1049c7130d6aa2802cde25316d08
diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index 2667f0c..f0160d4 100644
--- a/audio/oriole/tuning/bluenote/recording.gatf
+++ b/audio/oriole/tuning/bluenote/recording.gatf
Binary files differ
diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml
index c27188e..52a75ba 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -234,8 +234,6 @@
<param name="attackTime_ms" size="4" type="float"/>
<param name="releaseTime_ms" size="4" type="float"/>
<param name="hysteresis" size="4" type="float"/>
- <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
- <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
</struct>
<struct id="17">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
@@ -275,7 +273,7 @@
<block id="137">
<moduleRef id="14"/>
<moduleRef id="7"/>
- <moduleRef id="32"/>
+ <moduleRef id="8"/>
</block>
</signalflow>
<signalflow id="1000" name="Smart Feature">
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index dba7c69..61a6f5e 100644
--- a/audio/raven/tuning/bluenote/recording.gatf
+++ b/audio/raven/tuning/bluenote/recording.gatf
Binary files differ
diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml
index c27188e..52a75ba 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -234,8 +234,6 @@
<param name="attackTime_ms" size="4" type="float"/>
<param name="releaseTime_ms" size="4" type="float"/>
<param name="hysteresis" size="4" type="float"/>
- <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
- <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
</struct>
<struct id="17">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
@@ -275,7 +273,7 @@
<block id="137">
<moduleRef id="14"/>
<moduleRef id="7"/>
- <moduleRef id="32"/>
+ <moduleRef id="8"/>
</block>
</signalflow>
<signalflow id="1000" name="Smart Feature">