Merge cherrypicks of ['googleplex-android-review.googlesource.com/23214072'] into tm-qpr3-release.

Change-Id: Ibfed77a5407c613751a545bc69e6d958606f946a
diff --git a/device-barbet.mk b/device-barbet.mk
index 00a068f..69dbc2e 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -38,7 +38,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=41
+    ro.vendor.build.svn=42
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \