diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk
index 4b9c64ab..6498e054 100644
--- a/BoardConfig-16k-common.mk
+++ b/BoardConfig-16k-common.mk
@@ -35,6 +35,7 @@ BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
 BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
 BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
 
+BOARD_16K_OTA_USE_INCREMENTAL := true
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
 
diff --git a/CopyEfsTest/src/com/android/test/CopyEfsTest.java b/CopyEfsTest/src/com/android/test/CopyEfsTest.java
index 23152fc3..9314174d 100644
--- a/CopyEfsTest/src/com/android/test/CopyEfsTest.java
+++ b/CopyEfsTest/src/com/android/test/CopyEfsTest.java
@@ -56,6 +56,7 @@ public class CopyEfsTest extends BaseHostJUnit4Test {
         testDumpF2FS("efs");
         testDumpF2FS("efs_backup");
         testDumpF2FS("modem_userdata");
+        testDumpF2FS("persist");
     }
 
     private void testDumpF2FS(String name) throws Exception {
@@ -69,15 +70,22 @@ public class CopyEfsTest extends BaseHostJUnit4Test {
         r = getDevice().executeShellV2Command("umount /data/local/tmp/efs_test/mnt");
         assertEquals(r.getExitCode().intValue(), 0);
 
-        r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name));
+        r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPLo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name));
         assertEquals(r.getExitCode().intValue(), 0);
         r = getDevice().executeShellV2Command(String.format("mount -r /data/local/tmp/efs_test/%s.img /data/local/tmp/efs_test/mnt", name));
         assertEquals(r.getExitCode().intValue(), 0);
 
-        assertEquals("", getDevice().executeShellCommand("diff -rq /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump"));
-        // Remove timestamps at positions 6 and 7, because ls on device does not support --time-style
+        r = getDevice().executeShellV2Command("diff -rq --no-dereference /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump");
+        assertEquals(r.getExitCode().intValue(), 0);
+        assertEquals(r.getStdout(), "");
+
+        // Remove timestamps because ls on device does not support --time-style. This is AWKward.
+        // Format is [permissions] [links] [uid] [gid] [size] time [name/symlink]
+        // time may have different numbers of blocks
+        // symlinks will be of the form a -> b
+        // So we can check for -> in the second to last spot to determine what position the timestamp ends at
         // Remove totals because on disk block usage may change depending on filesystem
-        String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlLnR . | awk {'$6=\"\";$7=\"\";if ($1 != \"total\"){print $0}'}";
+        String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlnR . | awk {'if (NF>3 && $(NF-1) == \"->\") end=3; else end=1; for(i=6;i<=NF-end && i>0;i++)$i=\"\";if ($1 != \"total\"){print $0}'}";
         String mnt_ls = getDevice().executeShellCommand(String.format(ls_cmd, "mnt"));
         assertEquals(getDevice().executeShellCommand("echo $?"), "0\n");
         String dump_ls = getDevice().executeShellCommand(String.format(ls_cmd, "dump"));
diff --git a/device.mk b/device.mk
index dfc9f155..38de6cd2 100644
--- a/device.mk
+++ b/device.mk
@@ -589,6 +589,9 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 
+# Set util_clamp_min for s/w spatializer
+PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300
+
 # Calliope firmware overwrite
 #PRODUCT_COPY_FILES += \
 	device/google/zuma/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \