Merge "[automerger skipped] Merge "Emergency number database config updater" am: ca0f14ec1a am: 9208fc5a0a am: a1c6087157 am: 639d7e6110 -s ours am skip reason: change_id I0fbd48fe8ef5e008af714312859b513a22679fcb with SHA1 8163b80a7e is in history"