Merge "Fix script to compile emergency number database" am: e4eb692169
am: ee37a5b7b1

Change-Id: Ie1749db63d64104588049557402aa69941e7d7f3