Merge cherrypicks of [19628804, 19629901] into tm-release.

Change-Id: I4302b27875a6c0e8da9b4cdb9e54d01e0581daf8
diff --git a/device-oriole.mk b/device-oriole.mk
index 5302e26..59a9d63 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -168,7 +168,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=37
+    ro.vendor.build.svn=38
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index d63decc..059ed83 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -178,7 +178,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=37
+    ro.vendor.build.svn=38
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \