Merge cherrypicks of [3783687, 3783705, 3783726, 3783751, 3783752, 3783607, 3783727, 3784084] into oc-m4-release

Change-Id: I1c70c7214172c14777843fe1fb2591f3ff67d4f8
diff --git a/device.mk b/device.mk
index 89319f4..654393b 100755
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,7 @@
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=8
+    ro.vendor.build.svn=9
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \