Merge cherrypicks of [9544810, 9544811, 9544812, 9544813, 9546204, 9546205, 9546206, 9546207, 9544814] into qt-qpr1-release

Change-Id: Idd2ab34c76e8cf11eb14651e922cb6708818aaa8
diff --git a/device.mk b/device.mk
index 4614907..64cd1dc 100644
--- a/device.mk
+++ b/device.mk
@@ -939,7 +939,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=6
+	ro.vendor.build.svn=10
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json