Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809632', 'googleplex-android-review.googlesource.com/23861840', 'googleplex-android-review.googlesource.com/24425526'] into tm-qpr3-release.

Change-Id: Ib16f835953b4d5b1fe4c5756c5e3fd5eacf29993
diff --git a/device-barbet.mk b/device-barbet.mk
index 9e36493..98fbd48 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=43
+    ro.vendor.build.svn=46
 
 # Enable watchdog timeout loop breaker.
 PRODUCT_PROPERTY_OVERRIDES += \