Merge cherrypicks of [18356443] into sc-qpr3-release.

Change-Id: I034663b637e6c37521b93c5f8633e4a9ae4f7f67
diff --git a/device-barbet.mk b/device-barbet.mk
index 4b4950b..b7499dd 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -39,7 +39,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=21
+    ro.vendor.build.svn=23
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \