diff --git a/java/com/android/server/sip/SipSessionGroup.java b/java/com/android/server/sip/SipSessionGroup.java
index 49effa8..eb5cce7 100644
--- a/java/com/android/server/sip/SipSessionGroup.java
+++ b/java/com/android/server/sip/SipSessionGroup.java
@@ -883,12 +883,15 @@
             if (expires != null && (time < 0 || time > expires.getExpires())) {
                 time = expires.getExpires();
             }
+            if (time <= 0) {
+                time = EXPIRY_TIME;
+            }
             expires = (ExpiresHeader) response.getHeader(MinExpiresHeader.NAME);
             if (expires != null && time < expires.getExpires()) {
                 time = expires.getExpires();
             }
             Log.v(TAG, "Expiry time = " + time);
-            return (time > 0) ? time : EXPIRY_TIME;
+            return time;
         }
 
         private boolean registeringToReady(EventObject evt)
diff --git a/jni/rtp/AudioGroup.cpp b/jni/rtp/AudioGroup.cpp
index 9b0455c..93c809e 100644
--- a/jni/rtp/AudioGroup.cpp
+++ b/jni/rtp/AudioGroup.cpp
@@ -629,12 +629,13 @@
     if (mode < 0 || mode > LAST_MODE) {
         return false;
     }
-    //FIXME: temporary code to overcome echo and mic gain issues on herring board.
-    // Must be modified/removed when proper support for voice processing query and control
-    // is included in audio framework
+    // FIXME: temporary code to overcome echo and mic gain issues on herring and tuna boards.
+    // Must be modified/removed when the root cause of the issue is fixed in the hardware or
+    // driver
     char value[PROPERTY_VALUE_MAX];
     property_get("ro.product.board", value, "");
-    if (mode == NORMAL && !strcmp(value, "herring")) {
+    if (mode == NORMAL &&
+            (!strcmp(value, "herring") || !strcmp(value, "tuna"))) {
         mode = ECHO_SUPPRESSION;
     }
     if (mMode == mode) {