Merge cherrypicks of [17800024, 18160003, 18797386] into sc-d2-release.

Change-Id: Ie23f47043791c3af884465de4381225fb9e3fd6d
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 77f5d6d..844532d 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -117,7 +117,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=4
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \