Merge cherrypicks of ['googleplex-android-review.googlesource.com/21694103', 'googleplex-android-review.googlesource.com/22076527', 'googleplex-android-review.googlesource.com/22082171', 'googleplex-android-review.googlesource.com/22235518'] into tm-qpr2-release.

Change-Id: I5be896ea69863c474ce1d3a3c65fcc90d7728468
diff --git a/device-oriole.mk b/device-oriole.mk
index 5138525..41be3f8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=50
+    ro.vendor.build.svn=54
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 9f94907..4a3dba9 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -180,7 +180,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=50
+    ro.vendor.build.svn=54
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \