Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10696112-L14300000962710292.

SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I701b59642efa871f8902794ccc6ac865b1a829ea

device-lynx.mk

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