diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index 9fd4c78..66d5d6b 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -14,120 +14,119 @@
      limitations under the License.
 -->
 
-<!-- Generated file for ryu using measurements between OPR1.170623.012/OPR1.170623.014 and OPM1.170904.001/OPM1.170905.001 -->
+<!-- Generated file for ryu using measurements between OPR1.170623.019 and OPM1.170911.002 -->
 <MediaCodecs>
+    <!-- Measurements between OPR1.170623.016 and OPM1.170908.002 -->
     <Encoders>
         <MediaCodec name="OMX.Nvidia.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="336-336" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="199-215" /> <!-- N=114 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="122-124" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="73-94" /> <!-- N=114 v98%=1.4 -->
+            <Limit name="measured-frame-rate-320x240" range="333-333" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="197-211" /> <!-- N=118 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1280x720" range="125-125" /> <!-- N=118 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="73-93" /> <!-- N=118 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="307-307" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="218-218" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="121-122" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="70-70" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="304-304" /> <!-- N=118 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="216-216" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="122-123" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="70-70" /> <!-- N=118 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="683-683" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-176x144" range="684-684" /> <!-- N=118 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="552-552" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="154-155" /> <!-- N=114 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="76-76" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="36-36" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="555-555" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="155-156" /> <!-- N=118 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="76-76" /> <!-- N=118 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="36-36" /> <!-- N=118 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="776-776" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-176x144" range="780-780" /> <!-- N=118 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="162-162" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-640x360" range="102-102" /> <!-- N=114 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="36-36" /> <!-- N=114 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="161-161" /> <!-- N=118 v98%=1.2 -->
+            <!-- measured 98%:51-114 med:102/102 FLAKY(mn=46.0 < 51 - 204) -->
+            <Limit name="measured-frame-rate-640x360" range="91-102" /> <!-- TWEAKED N=118 v98%=1.5 -->
+            <Limit name="measured-frame-rate-1280x720" range="36-36" /> <!-- N=118 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=118 v98%=1.1 -->
         </MediaCodec>
+        <!-- Measurements between OPR1.170208.003 and OPM1.170908.002 -->
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 97%:117-159 med:154/153 N=58 -->
-            <Limit name="measured-frame-rate-320x180" range="153-153" /> <!-- v97%=1.2 (OPR1.170208.003-) -->
-            <!-- measured 98%:34-52 med:50/50 N=60 -->
-            <Limit name="measured-frame-rate-640x360" range="50-50" /> <!-- v98%=1.2 (OPR1.170208.003-) -->
-            <!-- measured 97%:10-13 med:12/12 N=58 -->
-            <Limit name="measured-frame-rate-1280x720" range="12-12" /> <!-- v97%=1.1 (OPR1.170208.003-) -->
-            <!-- measured 93%:5-7 med:6/6 N=26 -->
-            <Limit name="measured-frame-rate-1920x1080" range="6-6" /> <!-- v93%=1.1 (OPR1.170208.003-OPM1.170810.004) -->
+            <!-- measured 98%:117-159 med:154/154 N=70 -->
+            <Limit name="measured-frame-rate-320x180" range="154-154" /> <!-- v98%=1.2 -->
+            <!-- measured 98%:34-52 med:50/50 N=72 -->
+            <Limit name="measured-frame-rate-640x360" range="50-50" /> <!-- v98%=1.2 -->
+            <!-- measured 98%:10-13 med:12/12 N=70 -->
+            <Limit name="measured-frame-rate-1280x720" range="12-12" /> <!-- v98%=1.1 -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.Nvidia.h263.decode" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="2028-2040" /> <!-- N=108 v98%=1.6 -->
-            <Limit name="measured-frame-rate-352x288" range="2020-2053" /> <!-- N=108 v98%=1.7 -->
+            <Limit name="measured-frame-rate-176x144" range="2053-2060" /> <!-- N=110 v98%=1.6 -->
+            <Limit name="measured-frame-rate-352x288" range="2033-2062" /> <!-- N=110 v98%=1.7 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.h264.decode" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="1955-1955" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-720x480" range="996-996" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="471-471" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="212-212" /> <!-- N=108 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="1956-1956" /> <!-- N=110 v98%=1.3 -->
+            <Limit name="measured-frame-rate-720x480" range="995-995" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="471-471" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="212-212" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.h265.decode" type="video/hevc" update="true">
-            <!-- measured 98%:1134-3356 med:2257/2235 FLAKY(mn=1019.4 < 1118 - 4470) -->
-            <Limit name="measured-frame-rate-352x288" range="2235-2235" /> <!-- N=108 v98%=1.7 -->
-            <Limit name="measured-frame-rate-640x360" range="1916-1917" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-720x480" range="1555-1555" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="703-703" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="356-356" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-3840x2160" range="89-89" /> <!-- N=108 v98%=1.1 -->
+            <!-- measured 98%:1134-3356 med:2208/2204 FLAKY(mn=1019.4 < 1102 - 4408) -->
+            <Limit name="measured-frame-rate-352x288" range="2204-2204" /> <!-- N=110 v98%=1.7 -->
+            <Limit name="measured-frame-rate-640x360" range="1912-1917" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="1555-1556" /> <!-- N=110 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1280x720" range="704-704" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="356-356" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-3840x2160" range="89-89" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.mp4.decode" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="2051-2051" /> <!-- N=108 v98%=1.7 -->
-            <!-- measured 98%:1127-3049 med:2088/2088 FLAKY(mn=601.0 < 1044 - 4176) -->
-            <Limit name="measured-frame-rate-480x360" range="2088-2088" /> <!-- N=108 v98%=1.6 -->
+            <Limit name="measured-frame-rate-176x144" range="2031-2031" /> <!-- N=110 v98%=1.7 -->
+            <Limit name="measured-frame-rate-480x360" range="2056-2056" /> <!-- N=110 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.vp8.decode" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="2057-2057" /> <!-- N=108 v98%=1.6 -->
-            <Limit name="measured-frame-rate-640x360" range="1570-1570" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="459-460" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="238-238" /> <!-- N=108 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="2043-2043" /> <!-- N=110 v98%=1.7 -->
+            <Limit name="measured-frame-rate-640x360" range="1576-1576" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="462-463" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="238-238" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.Nvidia.vp9.decode" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:826-3096 med:1876/1857 FLAKY(mn=782.5 < 826 - 3714) -->
-            <Limit name="measured-frame-rate-320x180" range="1564-1857" /> <!-- TWEAKED N=108 v98%=1.9 -->
-            <Limit name="measured-frame-rate-640x360" range="1320-1320" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="419-419" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="242-243" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-3840x2160" range="64-64" /> <!-- N=108 v98%=1.2 -->
+            <!-- measured 98%:826-3096 med:1876/1856 FLAKY(mn=782.5 < 826 - 3712) -->
+            <Limit name="measured-frame-rate-320x180" range="1564-1856" /> <!-- TWEAKED N=110 v98%=1.9 -->
+            <Limit name="measured-frame-rate-640x360" range="1318-1319" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="421-421" /> <!-- N=110 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="243-243" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-3840x2160" range="64-64" /> <!-- N=110 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="807-807" /> <!-- N=108 v98%=1.5 -->
+            <Limit name="measured-frame-rate-176x144" range="810-810" /> <!-- N=110 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="535-535" /> <!-- N=108 v98%=1.5 -->
-            <Limit name="measured-frame-rate-720x480" range="181-181" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="32-32" /> <!-- N=108 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="493-524" /> <!-- N=110 v98%=1.5 -->
+            <Limit name="measured-frame-rate-720x480" range="181-181" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="32-32" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="648-708" /> <!-- N=108 v98%=1.5 -->
-            <Limit name="measured-frame-rate-640x360" range="349-350" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-720x480" range="296-311" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="115-115" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="55-55" /> <!-- N=108 v98%=1.3 -->
+            <Limit name="measured-frame-rate-352x288" range="635-704" /> <!-- N=110 v98%=1.5 -->
+            <Limit name="measured-frame-rate-640x360" range="344-349" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="293-311" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="115-115" /> <!-- N=110 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="56-56" /> <!-- N=110 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="884-910" /> <!-- N=108 v98%=1.4 -->
+            <Limit name="measured-frame-rate-176x144" range="862-906" /> <!-- N=110 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 98%:643-1058 med:931/932 FLAKY(mn=148.4 < 466 - 1864) -->
-            <Limit name="measured-frame-rate-320x180" range="931-932" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-640x360" range="325-325" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="69-69" /> <!-- N=110 v98%=1.1 (OPR1.170621.001-) -->
-            <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=108 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="928-928" /> <!-- N=110 v98%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="324-325" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="69-69" /> <!-- N=112 v98%=1.1 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=110 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="689-689" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-640x360" range="338-338" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1280x720" range="141-146" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="84-84" /> <!-- N=108 v98%=1.3 -->
+            <Limit name="measured-frame-rate-320x180" range="684-686" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-640x360" range="337-337" /> <!-- N=110 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="140-146" /> <!-- N=110 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="84-84" /> <!-- N=110 v98%=1.3 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1b13f00..9766de6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -51,6 +51,13 @@
     <!-- Enable device idle mode -->
     <bool name="config_enableAutoPowerModes">true</bool>
 
+    <!-- If true, enables verification of the lockscreen credential in the factory reset protection
+        flow. This should be true if gatekeeper / weaver credentials can still be checked after a
+        factory reset.
+
+        dragon's gatekeeper does not preserve credentials across factory resets. -->
+    <bool name="config_enableCredentialFactoryResetProtection">false</bool>
+
     <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>