Merge cherrypicks of [5285346, 5285158, 5284278] into pi-qpr1-release

Change-Id: Ie48ea2e6d0af7b1ffcb89f9e2c5e524c6fb50a40
diff --git a/device.mk b/device.mk
index 9ea2203..2b4a428 100755
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,7 @@
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=20
+    ro.vendor.build.svn=21
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \