am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev

* commit 'b047b1f73800ff92eea4ff4b3adc62e5a20eb8df':
  b/6705777 Remove 'speaker' from strings