Merge "Rename AnnouncementObserver to AnnouncementListener."