Merge cherrypicks of [19630898] into tm-release.

Change-Id: I34908bdaf5568d3fc6933df542c0f05f3b52b0a0
diff --git a/device.mk b/device.mk
index fe4b3a8..27edbd5 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=48
+	ro.vendor.build.svn=49
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json