Merge "Have repeatCallers tests use fully specified numbers" into tm-dev