Merge cherrypicks of [15987951, 16128023] into sc-d1-release.

Change-Id: Ic60cb83f860c7a7cdd54088de4943ce773501f2e
diff --git a/device-oriole.mk b/device-oriole.mk
index 22281a1..2614ae2 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -143,7 +143,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=4
+    ro.vendor.build.svn=6
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 0a07168..145a2af 100644
--- a/device-raven.mk
+++ b/device-raven.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=6
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \