diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 06dd935..05942f7 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/oriole/tuning/waves/waves_preset.mps b/audio/oriole/tuning/waves/waves_preset.mps
index 266092e..589875b 100644
Binary files a/audio/oriole/tuning/waves/waves_preset.mps and b/audio/oriole/tuning/waves/waves_preset.mps differ
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 06dd935..05942f7 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index 4441cbd..e35ea23 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index 4441cbd..e35ea23 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -19,7 +19,6 @@
 
     <path name="mfg-playback">
         <ctl name="PCM Playback Switch" value="1" />
-        <ctl name="PCM Playback Volume" value="1000" />
     </path>
 
     <path name="deep-buffer-playback speaker">
@@ -192,7 +191,6 @@
     </path>
 
     <path name="usb-playback-gain">
-        <ctl name="PCM Playback Volume" />
     </path>
 
     <path name="mfg-playback speaker">
diff --git a/device-oriole.mk b/device-oriole.mk
index 1ca4cad..63d69b8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -82,3 +82,6 @@ PRODUCT_COPY_FILES += \
 	device/google/gs101/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
 	device/google/gs101/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
 	device/google/gs101/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+
+# Keyboard bottom padding in dp for portrait mode
+PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10