[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L98600000962542387 into udc-release.

COASTGUARD_SKIP: I7b092c79ddf8f9832c601e8353ce4a092b282614
COASTGUARD_SKIP: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f
COASTGUARD_SKIP: I810a986d63c1290e982a818d8c3333ec154f132f

Change-Id: I3b8f578500cbea2133ec35f94b7da27c4b9de9f8
diff --git a/device-oriole.mk b/device-oriole.mk
index 0851fae..d8f40b2 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -182,7 +182,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=64
+    ro.vendor.build.svn=63
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 8e751cb..fd3e9ed 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -194,7 +194,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=64
+    ro.vendor.build.svn=63
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \