Merge cherrypicks of [15987951, 16091655] into sc-qpr1-d-release.

Change-Id: Ic21397ede005d50caa4218f388142a32610a252a
diff --git a/device-oriole.mk b/device-oriole.mk
index e53ebb3..a3744be 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=4
+    ro.vendor.build.svn=8
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index dc3b36f..723844c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=4
+    ro.vendor.build.svn=8
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \