Merge cherrypicks of [15581403, 15581423] into rvc-d2-release

Change-Id: I96f38558daa4ad4b0880c31cc53b39f3edd3977d
diff --git a/device-barbet.mk b/device-barbet.mk
index 3cc4e60..cd5cda0 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -37,7 +37,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=5
+    ro.vendor.build.svn=6
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \