[automerger skipped] Merge "Add Emergency Uniform Resource Name (URN)" am:...
[automerger skipped] Merge "Add Emergency Uniform Resource Name (URN)" am: bd400ae3 am: a567b336
am: 4424c8e5 -s ours
am skip reason: change_id I6c965d6b4a55e9370de3a9eeef5402468ae9c44b with SHA1 2a45c732 is in history
Change-Id: Ief22f8c8b14c5be5b0ba3c2cb1c241d763485771