Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417, 13924418, 13924419, 13923941, 13924588, 13923901, 13923902, 13924076, 13924077, 13924420, 13924421, 13924422, 13924423, 13924424, 13924645, 13924589, 13922107, 13924332, 13924333, 13924334, 13924335, 13924336, 13924665, 13923963, 13924646, 13924590, 13924666, 13923971, 13923942] into rvc-qpr2-release

Change-Id: I65e7b69fe4ba84e8ecba20c2bd0a7f39c8a54436
diff --git a/device-common.mk b/device-common.mk
index b3e963d..1fdb130 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -839,7 +839,7 @@
 # Increment the SVN for any official public releases
 ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=24
+	ro.vendor.build.svn=25
 endif
 
 # Enable iwlan service logging for debug