49231655 49337429 Finish adoption of service description in existing
tests.
49231655 49337429 Finish adoption of service description in existing
tests.