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

Change-Id: Ic090ce9884de1a69ddb7a334acadfeb35ae9e2e8
diff --git a/device-common.mk b/device-common.mk
index 36a14b7..8cd34ab 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=69
+	ro.vendor.build.svn=71
 endif
 
 # Enable iwlan service logging for debug