Merge "Add test coverage for EmergencyCallHelper." into udc-dev