Merge "Increase reliability of Teleservice tests." into main