Merge "Throw exception from addServiceAnnouncement impl"