Merge "Add both Emergency Number listener for testing"