Merge cherrypicks of ['googleplex-android-review.googlesource.com/22698622', 'googleplex-android-review.googlesource.com/22808758', 'googleplex-android-review.googlesource.com/22845477', 'googleplex-android-review.googlesource.com/23012900', 'googleplex-android-review.googlesource.com/23053589'] into tm-qpr3-c-release.

Change-Id: I35f545ce2c49a8c5f0bfbd7a56d7c2c1afb8f17b
diff --git a/device-felix.mk b/device-felix.mk
index 00e54ec..361fca2 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -197,7 +197,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=6
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\