Snap for 10481007 from 09e85f87b3b60517ead2206d3abef584c8e808ab to mainline-odp-release

Change-Id: I6f6e97c85e5471ccdb48c24d42af0399a3753901
diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index 891865b..34059f0 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -117,6 +117,9 @@
 on init && property:ro.bootmode=normal
     write /sys/devices/platform/hall_sensor/enable 0
 
+on init && property:ro.bootmode=unknown
+    write /sys/devices/platform/hall_sensor/enable 0
+
 on init && property:ro.bootmode=factory
     write /sys/devices/platform/hall_sensor/enable 0
 
diff --git a/device-felix.mk b/device-felix.mk
index 29ce0f0..86f55cd 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -205,7 +205,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=19
+    ro.vendor.build.svn=20
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\