Merge cherrypicks of [19911939, 19911957] into tm-release.

Change-Id: I5441d080c25d84492a1ce66df1ac3a3faecdbafa
diff --git a/device-oriole.mk b/device-oriole.mk
index aa541dc..f65f3e6 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=39
+    ro.vendor.build.svn=40
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index d6e54e7..0f62834 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=39
+    ro.vendor.build.svn=40
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \