Merge cherrypicks of [6333813, 6333231, 6333198] into pi-qpr2-release

Change-Id: I408091e8646d90aac240e46117e6aa193069b4b2
diff --git a/device.mk b/device.mk
index 83af3b9..45c60ff 100755
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,7 @@
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=24
+    ro.vendor.build.svn=25
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \