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

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