am 1b91d68c: Merge "Update audio terminology"

* commit '1b91d68c517a00765fbd0ed747fe3d4e51820680':
  Update audio terminology