am a7b64e59: Merge "More audio terminology."

* commit 'a7b64e59690c990f8a2a652b74e9e911dda36dd1':
  More audio terminology.