Merge cherrypicks of [16433656] into sc-qpr1-release.

Change-Id: I13c4308b44c844eeb01e91c5cd68f403fcf5cd6d
diff --git a/device.mk b/device.mk
index fed70c6..a13578e 100644
--- a/device.mk
+++ b/device.mk
@@ -879,7 +879,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=53
+	ro.vendor.build.svn=54
 
 # Vendor verbose logging default property
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))