diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 5b3482c..8dfec97 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -3946,6 +3946,7 @@
                 (mLinkedCameraId != mCameraId) ) {
                 LOGE("Dualcam: mLinkedCameraId %d is invalid, current cam id = %d",
                     mLinkedCameraId, mCameraId);
+                pthread_mutex_unlock(&mMutex);
                 goto error_exit;
             }
         }
@@ -3963,6 +3964,7 @@
             if (sessionId[mLinkedCameraId] == 0xDEADBEEF) {
                 LOGE("Dualcam: Invalid Session Id ");
                 pthread_mutex_unlock(&gCamLock);
+                pthread_mutex_unlock(&mMutex);
                 goto error_exit;
             }
 
@@ -3982,6 +3984,7 @@
                     mCameraHandle->camera_handle, m_pRelCamSyncBuf);
             if (rc < 0) {
                 LOGE("Dualcam: link failed");
+                pthread_mutex_unlock(&mMutex);
                 goto error_exit;
             }
         }
@@ -4181,6 +4184,7 @@
             if(ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters,
                 CAM_INTF_META_FRAME_NUMBER, request->frame_number)) {
                 LOGE("Failed to set the frame number in the parameters");
+                pthread_mutex_unlock(&mMutex);
                 return BAD_VALUE;
             }
         }
@@ -4486,6 +4490,7 @@
             /* Update stream id of all the requested buffers */
             if (ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters, CAM_INTF_META_STREAM_ID, streamsArray)) {
                 LOGE("Failed to set stream type mask in the parameters");
+                pthread_mutex_unlock(&mMutex);
                 return BAD_VALUE;
             }
 
diff --git a/device-common.mk b/device-common.mk
index b49f227..377286b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -85,10 +85,6 @@
 PRODUCT_PACKAGES += fs_config_files \
                     fs_config_dirs
 
-# TextClassifier smart selection models files
-PRODUCT_PACKAGES += \
-    textclassifier.smartselection.bundle1
-
 # Audio configuration
 USE_XML_AUDIO_POLICY_CONF := 1
 PRODUCT_COPY_FILES += \
diff --git a/init.common.rc b/init.common.rc
index 8dd34ad..0d3c656 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -24,6 +24,10 @@
     write /sys/devices/soc/624000.ufshc/624000.ufshc:ufs_variant/pm_qos_enable 0
     write /sys/module/lpm_levels/parameters/sleep_disabled Y
 
+    # QSEE rpmb listener need symlink for bootdevice
+    wait /dev/block/platform/soc/${ro.boot.bootdevice}
+    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
+
     # We have vendor/ as early mount so we can start qseecomd earlier
     # early mount partions e.g. vendor/ will be mounted in init first stage
     # see b/27805372
@@ -98,9 +102,6 @@
     write /proc/sys/vm/page-cluster 0
 
 on fs
-    wait /dev/block/platform/soc/${ro.boot.bootdevice}
-    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
-
     mount_all /vendor/etc/fstab.${ro.hardware} --early
 
     # Keeping following partitions outside fstab file. As user may not have
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index e5624c0..c48a793 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -14,138 +14,136 @@
      limitations under the License.
 -->
 
-<!-- Generated file for marlin/sailfish using measurements between OPD1.170615.005 and OPM1.170806.001 -->
+<!-- Generated file for marlin/sailfish using measurements between OPR1.170207.001 and OPM1.170817.001 -->
 <MediaCodecs>
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="115-115" /> <!-- N=194 v98%=1.5 -->
-            <Limit name="measured-frame-rate-352x288" range="89-89" /> <!-- N=198 v98%=1.6 -->
+            <Limit name="measured-frame-rate-176x144" range="112-112" /> <!-- N=212 v98%=1.4 -->
+            <Limit name="measured-frame-rate-352x288" range="88-88" /> <!-- N=214 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="96-96" /> <!-- N=198 v98%=1.5 -->
-            <Limit name="measured-frame-rate-720x480" range="56-56" /> <!-- N=196 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=196 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="22-22" /> <!-- N=196 v98%=1.5 -->
+            <Limit name="measured-frame-rate-320x240" range="93-93" /> <!-- N=212 v98%=1.5 -->
+            <Limit name="measured-frame-rate-720x480" range="55-55" /> <!-- N=210 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=214 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="22-22" /> <!-- N=212 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="94-94" /> <!-- N=196 v98%=1.5 -->
-            <Limit name="measured-frame-rate-720x480" range="55-55" /> <!-- N=190 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=190 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="24-24" /> <!-- N=196 v98%=1.5 -->
-            <Limit name="measured-frame-rate-3840x2160" range="16-23" /> <!-- N=192 v98%=2.0 -->
+            <Limit name="measured-frame-rate-320x240" range="93-93" /> <!-- N=210 v98%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="54-54" /> <!-- N=206 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=202 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="24-24" /> <!-- N=210 v98%=1.5 -->
+            <Limit name="measured-frame-rate-3840x2160" range="16-23" /> <!-- N=210 v98%=2.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="110-110" /> <!-- N=198 v98%=1.6 -->
-            <Limit name="measured-frame-rate-352x288" range="84-84" /> <!-- N=196 v98%=1.5 -->
-            <Limit name="measured-frame-rate-640x480" range="62-62" /> <!-- N=196 v98%=1.4 -->
+            <Limit name="measured-frame-rate-176x144" range="109-109" /> <!-- N=214 v98%=1.5 -->
+            <Limit name="measured-frame-rate-352x288" range="85-85" /> <!-- N=208 v98%=1.5 -->
+            <Limit name="measured-frame-rate-640x480" range="61-61" /> <!-- N=212 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="94-94" /> <!-- N=198 v98%=1.5 -->
-            <Limit name="measured-frame-rate-640x360" range="67-67" /> <!-- N=196 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="30-32" /> <!-- N=198 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="19-21" /> <!-- N=192 v98%=1.5 -->
+            <Limit name="measured-frame-rate-320x180" range="95-95" /> <!-- N=216 v98%=1.4 -->
+            <Limit name="measured-frame-rate-640x360" range="66-66" /> <!-- N=210 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="32-33" /> <!-- N=210 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-22" /> <!-- N=204 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <!-- measured 96%:90-240 med:143/143 FLAKY(mn=55.6 < 72 - 286 < mx=357.9) -->
-            <Limit name="measured-frame-rate-176x144" range="143-143" /> <!-- N=198 v96%=1.6 -->
+            <!-- measured 97%:94-240 med:141/141 FLAKY(71 - 282 < mx=357.9) -->
+            <Limit name="measured-frame-rate-176x144" range="141-179" /> <!-- TWEAKED N=216 v97%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <!-- measured 98%:150-320 med:265/267 FLAKY(mn=96.5 < 134 - 534) -->
-            <Limit name="measured-frame-rate-320x240" range="267-267" /> <!-- N=198 v98%=1.5 -->
-            <Limit name="measured-frame-rate-720x480" range="124-124" /> <!-- N=198 v98%=1.4 -->
-            <!-- measured 98%:21-90 med:68/70 FLAKY(mn=19.0 < 21 - 140) variance:2.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="41-70" /> <!-- N=212 -->
-            <Limit name="measured-frame-rate-1920x1080" range="24-37" /> <!-- N=198 v98%=1.9 -->
+            <!-- measured 98%:152-313 med:263/263 FLAKY(mn=96.5 < 132 - 526) -->
+            <Limit name="measured-frame-rate-320x240" range="263-263" /> <!-- N=212 v98%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="123-123" /> <!-- N=214 v98%=1.4 -->
+            <!-- measured 98%:21-89 med:68/70 FLAKY(mn=19.0 < 21 - 140) variance:2.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="41-70" /> <!-- N=226 -->
+            <!-- measured 98%:14-49 med:39/36 FLAKY(mn=12.4 < 13 - 72) -->
+            <Limit name="measured-frame-rate-1920x1080" range="25-36" /> <!-- N=214 v98%=1.9 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <!-- measured 98%:81-252 med:134/133 FLAKY(67 - 266 < mx=301.8) -->
-            <Limit name="measured-frame-rate-176x144" range="133-133" /> <!-- N=192 v98%=1.8 -->
+            <!-- measured 98%:84-252 med:135/135 FLAKY(68 - 270 < mx=301.8) -->
+            <Limit name="measured-frame-rate-176x144" range="135-151" /> <!-- TWEAKED N=210 v98%=1.7 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 98%:44-152 med:96/96 FLAKY(mn=41.3 < 44 - 194) -->
-            <Limit name="measured-frame-rate-320x180" range="87-97" /> <!-- N=198 v98%=1.9 -->
-            <Limit name="measured-frame-rate-640x360" range="40-40" /> <!-- N=188 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="37-37" /> <!-- N=196 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="20-20" /> <!-- N=192 v98%=1.2 -->
+            <!-- measured 98%:49-152 med:106/105 FLAKY(mn=43.0 < 49 - 210) -->
+            <Limit name="measured-frame-rate-320x180" range="97-105" /> <!-- N=214 v98%=1.8 -->
+            <Limit name="measured-frame-rate-640x360" range="40-40" /> <!-- N=200 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="38-38" /> <!-- N=208 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="20-20" /> <!-- N=208 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:95-133 med:125/125 N=82 -->
-            <Limit name="measured-frame-rate-320x180" range="125-125" /> <!-- v98%=1.2 -->
-            <!-- measured 98%:35-44 med:43/43 N=82 -->
-            <Limit name="measured-frame-rate-640x360" range="43-43" /> <!-- v98%=1.1 -->
-            <!-- measured 98%:10-13 med:12/12 N=82 -->
-            <Limit name="measured-frame-rate-1280x720" range="12-12" /> <!-- v98%=1.1 -->
-            <!-- measured 98%:4-6 med:5/5 N=84 -->
-            <Limit name="measured-frame-rate-1920x1080" range="5-5" /> <!-- v98%=1.2 -->
+            <Limit name="measured-frame-rate-320x180" range="134-134" /> <!-- N=162 v98%=1.2 -->
+            <Limit name="measured-frame-rate-640x360" range="46-46" /> <!-- N=154 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="12-12" /> <!-- N=154 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="5-5" /> <!-- N=132 v98%=1.3 -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="153-153" /> <!-- N=202 v98%=1.1 -->
-            <Limit name="measured-frame-rate-352x288" range="152-152" /> <!-- N=202 v98%=1.1 -->
+            <Limit name="measured-frame-rate-176x144" range="155-155" /> <!-- N=214 v98%=1.1 -->
+            <Limit name="measured-frame-rate-352x288" range="154-154" /> <!-- N=208 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="293-293" /> <!-- N=202 v98%=1.1 -->
-            <Limit name="measured-frame-rate-720x480" range="172-172" /> <!-- N=194 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="334-334" /> <!-- N=200 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="202-202" /> <!-- N=202 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="293-293" /> <!-- N=216 v98%=1.1 -->
+            <Limit name="measured-frame-rate-720x480" range="174-174" /> <!-- N=208 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="328-328" /> <!-- N=212 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="201-201" /> <!-- N=216 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="338-338" /> <!-- N=196 v98%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="237-237" /> <!-- N=202 v98%=1.0 -->
-            <Limit name="measured-frame-rate-720x480" range="181-181" /> <!-- N=202 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="82-95" /> <!-- N=204 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="252-252" /> <!-- N=194 v98%=1.0 -->
-            <Limit name="measured-frame-rate-3840x2160" range="69-69" /> <!-- N=194 v98%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="338-338" /> <!-- N=212 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="237-237" /> <!-- N=216 v98%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="182-182" /> <!-- N=210 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="82-95" /> <!-- N=214 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="252-252" /> <!-- N=210 v98%=1.0 -->
+            <Limit name="measured-frame-rate-3840x2160" range="69-69" /> <!-- N=204 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="148-148" /> <!-- N=200 v98%=1.1 -->
-            <Limit name="measured-frame-rate-480x360" range="147-147" /> <!-- N=202 v98%=1.1 -->
+            <Limit name="measured-frame-rate-176x144" range="148-148" /> <!-- N=212 v98%=1.1 -->
+            <Limit name="measured-frame-rate-480x360" range="148-148" /> <!-- N=214 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="368-368" /> <!-- N=196 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="274-274" /> <!-- N=194 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="378-378" /> <!-- N=202 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="254-254" /> <!-- N=202 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="369-369" /> <!-- N=208 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="274-274" /> <!-- N=208 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="371-371" /> <!-- N=220 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="254-254" /> <!-- N=208 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="284-284" /> <!-- N=202 v98%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="252-262" /> <!-- N=202 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="305-305" /> <!-- N=194 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="270-270" /> <!-- N=204 v98%=1.0 -->
-            <Limit name="measured-frame-rate-3840x2160" range="45-45" /> <!-- N=188 v98%=1.2 -->
+            <Limit name="measured-frame-rate-320x180" range="285-285" /> <!-- N=206 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="252-252" /> <!-- N=206 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="306-306" /> <!-- N=208 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="270-270" /> <!-- N=212 v98%=1.0 -->
+            <Limit name="measured-frame-rate-3840x2160" range="45-45" /> <!-- N=198 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="291-291" /> <!-- N=196 v98%=1.4 -->
+            <Limit name="measured-frame-rate-176x144" range="280-280" /> <!-- N=214 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="435-435" /> <!-- N=204 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="202-202" /> <!-- N=204 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="76-76" /> <!-- N=202 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="34-34" /> <!-- N=204 v98%=1.2 -->
+            <Limit name="measured-frame-rate-320x240" range="426-426" /> <!-- N=216 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="197-197" /> <!-- N=210 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="76-76" /> <!-- N=212 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="34-34" /> <!-- N=210 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="495-495" /> <!-- N=194 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="297-297" /> <!-- N=202 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="263-263" /> <!-- N=204 v98%=1.2 -->
-            <!-- measured 98%:90-137 med:125/125 FLAKY(mn=62.1 < 63 - 250) -->
-            <Limit name="measured-frame-rate-1280x720" range="125-125" /> <!-- N=194 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="67-67" /> <!-- N=202 v98%=1.2 -->
+            <Limit name="measured-frame-rate-352x288" range="493-493" /> <!-- N=206 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="295-295" /> <!-- N=208 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="263-263" /> <!-- N=216 v98%=1.2 -->
+            <!-- measured 98%:90-140 med:125/125 FLAKY(mn=62.1 < 63 - 250) -->
+            <Limit name="measured-frame-rate-1280x720" range="125-125" /> <!-- N=206 v98%=1.2 -->
+            <!-- measured 98%:54-74 med:68/68 FLAKY(34 - 136) -->
+            <Limit name="measured-frame-rate-1920x1080" range="68-68" /> <!-- N=208 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="354-354" /> <!-- N=196 v98%=1.5 -->
+            <Limit name="measured-frame-rate-176x144" range="344-344" /> <!-- N=212 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="897-897" /> <!-- N=204 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="338-338" /> <!-- N=200 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="77-77" /> <!-- N=206 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="34-34" /> <!-- N=204 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="898-898" /> <!-- N=214 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="340-340" /> <!-- N=212 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="78-78" /> <!-- N=220 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="34-34" /> <!-- N=212 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="622-622" /> <!-- N=200 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="195-195" /> <!-- N=204 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="88-88" /> <!-- N=204 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="54-54" /> <!-- N=201 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="621-621" /> <!-- N=212 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="194-194" /> <!-- N=214 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="87-87" /> <!-- N=216 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="54-54" /> <!-- N=205 v98%=1.1 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>