Merge "Changes to support emergency registration APIs and callbacks." into main