[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L31500000959114895 into tm-qpr2-release.

COASTGUARD_SKIP: Ib6987ac979b5ef5f69865b9ecb2aed160ec8b9dc
COASTGUARD_SKIP: Icced5b28a7d7a8505044890a40e1cede648f4226

Change-Id: I910fdd3692eaeeec5ac060fb452222387f4e01d2
diff --git a/device.mk b/device.mk
index 55cd0c1..a48d939 100644
--- a/device.mk
+++ b/device.mk
@@ -886,7 +886,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=59
+	ro.vendor.build.svn=58
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json