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

Change-Id: I185ac873bc8a57bad2ba94e0c9ab23467f71b962
diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index 4d74a89..7252480 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -523,12 +523,12 @@
   eccs {
     phone_number: "144"
     types: AMBULANCE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "118"
     types: FIRE
-    routing: EMERGENCY
+    routing: NORMAL
   }
   eccs {
     phone_number: "143"
diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index bf0cb6c..fc86961 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ