Merge cherrypicks of ['googleplex-android-review.googlesource.com/23214526', 'googleplex-android-review.googlesource.com/23395489'] into tm-qpr3-release.

Change-Id: I2c2aa95c2aff1ce378b68e1376e6fdb708530fa2
diff --git a/device-oriole.mk b/device-oriole.mk
index af84ea1..0c8e3f8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=56
+    ro.vendor.build.svn=58
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 394a99e..d0dc3b5 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -180,7 +180,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=56
+    ro.vendor.build.svn=58
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \