Merge "Add Emergency Uniform Resource Number (URN)"
am: e01a358b5b

Change-Id: I0c9f4182f8255ba0a6eeac501834ff26837cd357