Merge "b/6705777 Remove 'speaker' from strings" into jb-dev