Merge "Rename addServiceAnnouncement-related methods"