diff --git a/device-cheetah.mk b/device-cheetah.mk
index 28e4897..79394fc 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=26
+    ro.vendor.build.svn=29
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index 4518483..51a85c2 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=26
+    ro.vendor.build.svn=29
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index fae3dd9..f9fd8c7 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x53532B53
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x53532B53
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x53532753
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x53532753
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x34
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x34
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 99020e6..c48282f 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 99020e6..c48282f 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 5e45dae..42e7d28 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x5F5F2F5F
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x5F5F2F5F
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x3B3B1F3B
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x3B3B1F3B
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index 864381f..df92eb3 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index 853f60a..d9d6e84 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index f676eea..796507b 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447
 ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.ant_delay=16462
 ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
@@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409
 ant0.ch9.prf16.tx_power=0x5F5F2F5F
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.ant_delay=16444
 ant0.ch9.prf64.tx_power=0x5F5F2F5F
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
@@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414
 ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.ant_delay=16427
 ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26