diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 22bbc49..31989ca 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright (C) 2012 The Android Open Source Project
-     Copyright (C) 2014 The Linux Foundation. All rights reserved.
+     Copyright (C) 2014-2016 The Linux Foundation. All rights reserved.
      Not a contribution.
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,6 +92,7 @@ Only the three quirks included above are recognized at this point:
   | mpeg2    | 1920    1088    30       40     244800  |  N       Y        |
   | vc1      | 1920    1088    60       60     489600  |  N       N        |
   | vp8      | 3840    2160    30      100     972000  |  Y       N        |
+  | vp9      | 3840    2160    30      100     972000  |  N       N        |
   | divx3    |  720     480    30        2      40500  |  N       N        |
   | div4/5/6 | 1920    1088    30       10     244800  |  N       N        |
   |__________|_________________________________________|___________________|
@@ -240,7 +241,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="7" />
+            <Limit name="concurrent-instances" max="9" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -354,6 +355,17 @@ Only the three quirks included above are recognized at this point:
             <Feature name="adaptive-playback" />
             <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-100000000" />
+            <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="16" />
+        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -379,5 +391,4 @@ Only the three quirks included above are recognized at this point:
         </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
-    <Include href="media_codecs_ffmpeg.xml" />
 </MediaCodecs>
diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml
index 27f17cf..275915d 100644
--- a/configs/media_codecs_performance.xml
+++ b/configs/media_codecs_performance.xml
@@ -22,9 +22,9 @@
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="294-294" />
-            <Limit name="measured-frame-rate-720x480" range="244-244" />
-            <Limit name="measured-frame-rate-1280x720" range="90-90" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
+            <Limit name="measured-frame-rate-720x480" range="80-80" />
+            <Limit name="measured-frame-rate-1280x720" range="31-31" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="293-293" />
@@ -38,14 +38,23 @@
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="312-312" />
             <Limit name="measured-frame-rate-640x360" range="175-174" />
-            <Limit name="measured-frame-rate-1280x720" range="81-81" />
+            <Limit name="measured-frame-rate-1280x720" range="29-29" />
             <Limit name="measured-frame-rate-1920x1080" range="37-37" />
         </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.hevc" update="true">
+           <Type name="video/hevc">
+               <Limit name="measured-frame-rate-320x240" range="340-340" />
+               <Limit name="measured-frame-rate-720x480" range="78-78" />
+               <Limit name="measured-frame-rate-1280x720" range="31-31" />
+               <Limit name="measured-frame-rate-1920x1080" range="28-28" />
+               <Limit name="measured-frame-rate-3840x2160" range="24-24" />
+            </Type>
+        </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="185-185" />
             <Limit name="measured-frame-rate-720x480" range="87-87" />
             <Limit name="measured-frame-rate-1280x720" range="45-45" />
-            <Limit name="measured-frame-rate-1920x1080" range="28-28" />
+            <Limit name="measured-frame-rate-1920x1080" range="14-14" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="354-354" />
@@ -54,10 +63,10 @@
             <Limit name="measured-frame-rate-176x144" range="385-385" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="390-390" />
-            <Limit name="measured-frame-rate-640x360" range="199-199" />
-            <Limit name="measured-frame-rate-1280x720" range="91-91" />
-            <Limit name="measured-frame-rate-1920x1080" range="43-43" />
+            <Limit name="measured-frame-rate-320x180" range="91-91" />
+            <Limit name="measured-frame-rate-640x360" range="37-37" />
+            <Limit name="measured-frame-rate-1280x720" range="18-18" />
+            <Limit name="measured-frame-rate-1920x1080" range="9-9" />
         </MediaCodec>
     </Encoders>
     <Decoders>
@@ -65,21 +74,22 @@
             <Limit name="measured-frame-rate-320x240" range="409-409" />
             <Limit name="measured-frame-rate-720x480" range="239-239" />
             <Limit name="measured-frame-rate-1280x720" range="197-197" />
-            <Limit name="measured-frame-rate-1920x1088" range="88-88" />
+            <Limit name="measured-frame-rate-1920x1088" range="39-39" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="434-434" />
             <Limit name="measured-frame-rate-720x480" range="338-338" />
-            <Limit name="measured-frame-rate-1280x720" range="241-241" />
-            <Limit name="measured-frame-rate-1920x1088" range="120-120" />
-            <Limit name="measured-frame-rate-3840x2160" range="30-30" />
+            <Limit name="measured-frame-rate-1280x720" range="99-99" />
+            <Limit name="measured-frame-rate-1920x1088" range="43-43" />
+            <Limit name="measured-frame-rate-3840x2160" range="9-9" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="283-283" />
             <Limit name="measured-frame-rate-352x288" range="323-323" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-480x360" range="268-268" />
+            <Limit name="measured-frame-rate-176x144" range="414-414" />
+             <Limit name="measured-frame-rate-480x360" range="268-268" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x240" range="430-430" />
@@ -87,33 +97,46 @@
             <Limit name="measured-frame-rate-1280x720" range="389-389" />
             <Limit name="measured-frame-rate-1920x1080" range="199-199" />
         </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x240" range="344-344" />
+            <Limit name="measured-frame-rate-640x360" range="299-299" />
+            <Limit name="measured-frame-rate-1280x720" range="348-348" />
+            <Limit name="measured-frame-rate-1920x1080" range="232-232" />
+            <Limit name="measured-frame-rate-3840x2160" range="48-48" />
+        </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="536-536" />
-            <Limit name="measured-frame-rate-720x480" range="270-270" />
-            <Limit name="measured-frame-rate-1280x720" range="135-135" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
+            <Limit name="measured-frame-rate-720x480" range="109-109" />
+            <Limit name="measured-frame-rate-1280x720" range="43-43" />
+            <Limit name="measured-frame-rate-1920x1080" range="13-13" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="458-458" />
-            <Limit name="measured-frame-rate-720x480" range="344-344" />
-            <Limit name="measured-frame-rate-1280x720" range="211-211" />
-            <Limit name="measured-frame-rate-1920x1080" range="131-131" />
+            <Limit name="measured-frame-rate-352x288" range="200-200" />
+            <Limit name="measured-frame-rate-640x360" range="165-165" />
+            <Limit name="measured-frame-rate-720x480" range="93-93" />
+            <Limit name="measured-frame-rate-1280x720" range="75-75" />
+            <Limit name="measured-frame-rate-1920x1080" range="34-34" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="688-688" />
-            <Limit name="measured-frame-rate-352x288" range="697-697" />
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
+            <Limit name="measured-frame-rate-352x288" range="185-185" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
+            <Type name="video/mp4v-es">
+                <Limit name="measured-frame-rate-176x144" range="340-340" />
+            </Type>
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="1031-1031" />
-            <Limit name="measured-frame-rate-640x360" range="609-609" />
-            <Limit name="measured-frame-rate-1280x720" range="106-106" />
-            <Limit name="measured-frame-rate-1920x1080" range="97-97" />
+            <Limit name="measured-frame-rate-320x180" range="320-320" />
+            <Limit name="measured-frame-rate-640x360" range="92-92" />
+            <Limit name="measured-frame-rate-1280x720" range="29-29" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-25" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x240" range="604-604" />
-            <Limit name="measured-frame-rate-640x360" range="430-430" />
-            <Limit name="measured-frame-rate-1280x720" range="206-206" />
-            <Limit name="measured-frame-rate-1920x1080" range="129-129" />
+            <Limit name="measured-frame-rate-320x180" range="191-191" />
+            <Limit name="measured-frame-rate-640x360" range="82-82" />
+            <Limit name="measured-frame-rate-1280x720" range="42-42" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-25" />
         </MediaCodec>
     </Decoders>
 </MediaCodecs>
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index e2e8609..dd39edf 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -93,7 +93,7 @@
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <!-- Back Camera -->
-    <CamcorderProfiles cameraId="0" startOffsetMs="300">
+    <CamcorderProfiles cameraId="0">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -186,6 +186,32 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="42000000"
+             width="2560"
+             height="1440"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="20000000"
+             width="2048"
+             height="1080"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="42000000"
@@ -352,6 +378,34 @@
              channels="2" />
     </EncoderProfile>
 
+    <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="42000000"
+             width="2560"
+             height="1440"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="20000000"
+             width="2048"
+             height="1080"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="156000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="42000000"
@@ -387,7 +441,7 @@
 
     </CamcorderProfiles>
     <!-- Front Camera -->
-    <CamcorderProfiles cameraId="1" startOffsetMs="300">
+    <CamcorderProfiles cameraId="1">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -685,6 +739,14 @@
         maxHFRFrameWidth="0" maxHFRFrameHeight="0"
         maxHFRMode="0"  />
 
+    <VideoEncoderCap name="hevc" enabled="true"
+        minBitRate="64000" maxBitRate="100000000"
+        minFrameWidth="176" maxFrameWidth="3840"
+        minFrameHeight="144" maxFrameHeight="2160"
+        minFrameRate="15" maxFrameRate="30"
+        maxHFRFrameWidth="0" maxHFRFrameHeight="0"
+        maxHFRMode="0"  />
+
     <AudioEncoderCap name="aac" enabled="true"
         minBitRate="8000" maxBitRate="96000"
         minSampleRate="8000" maxSampleRate="48000"
@@ -710,10 +772,10 @@
         minSampleRate="8000" maxSampleRate="8000"
         minChannels="1" maxChannels="1" />
 
-    <AudioEncoderCap name="lpcm" enabled="true"
+   <!-- <AudioEncoderCap name="lpcm" enabled="true"
         minBitRate="768000" maxBitRate="4608000"
         minSampleRate="48000" maxSampleRate="48000"
-        minChannels="1" maxChannels="6" />
+        minChannels="1" maxChannels="6" />-->
 
     <!--
         FIXME: