Merge cherrypicks of ['googleplex-android-review.googlesource.com/23229420', 'googleplex-android-review.googlesource.com/23436282'] into tm-qpr3-release.

Change-Id: I585f11003a20b01bf1a3782a898684abfc727784

device-lynx.mk

@@ -199,7 +199,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=6
+    ro.vendor.build.svn=8
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \