Merge cherrypicks of ['googleplex-android-review.googlesource.com/21989315', 'googleplex-android-review.googlesource.com/22076423'] into tm-qpr2-release.
Change-Id: I5b66b1065ef2c6eb942ea2592949c9d8bfe53cb1
diff --git a/device.mk b/device.mk
index a48d939..01783ca 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=58
+ ro.vendor.build.svn=60
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json