Clean up service descriptions

Change-Id: I85c46635721d01d879b59d902f77753a0b92c149