Clean up service descriptions

Change-Id: Ie03ed62c901bb6c18e392356547fb7cfe3a23191
Merge "Clean up service descriptions"