Merge cherrypicks of ['googleplex-android-review.googlesource.com/21411280', 'googleplex-android-review.googlesource.com/21992144', 'googleplex-android-review.googlesource.com/22076526'] into tm-qpr2-release.

Change-Id: I0615b1228d0880d668109778bce5b95a855f36c7
diff --git a/device-common.mk b/device-common.mk
index fe7b8e8..653fcc3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -845,7 +845,7 @@
 # Increment the SVN for any official public releases
 ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.build.svn=62
+	ro.vendor.build.svn=65
 endif
 
 # Enable iwlan service logging for debug