Merge cherrypicks of [18703046, 18703426, 18911632, 18919006, 19293127, 19294567] into sc-qpr3-release.

Change-Id: I9d1c23c5c9d13cc16c7a20583b4fd553c0def6f1
diff --git a/device-oriole.mk b/device-oriole.mk
index d41b43d..e48d1a4 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -175,7 +175,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=30
+    ro.vendor.build.svn=33
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 7972bd5..e52cbad 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -187,7 +187,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=30
+    ro.vendor.build.svn=33
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \