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

Change-Id: I33be4bec015d71415456a9abbd69bc705556afa8