Merge "Add getter/setter to access emergency number overrides"