Merge "Update emergency number authority name to be more generic" into sc-dev