Merge "Support test emergency numbers" into udc-dev