Merge "Add Emergency Uniform Resource Name (URN)"
am: bd400ae327

Change-Id: I1ba8fcaca842c405f9851ad26d0cbaf117d5acf7