Merge "Update javadoc for accessibility announcements"