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

Change-Id: I4017b62cd6123a44bdad6d6b0d2b9f97b129f076