[automerger skipped] Merge "Add Emergency Uniform Resource Number (URN)" am: e01a358b5b am: 888d87ac7a
am: c322894cb2 -s ours
am skip reason: change_id I87537f7123910e9843207428eb3167a90a15b6df with SHA1 03bde886e5 is in history

Change-Id: Idf675239864ed69a1566f9212652cf8c74c3920b