Merge "Add more unit tests for Assisted Dialing"