Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336140', 'googleplex-android-review.googlesource.com/24373027'] into udc-release.

Change-Id: I620f2a98e1d6b4bec7ed5d54c4f87efda3ef7fc9

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=12
+    ro.vendor.build.svn=14
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \