am 1f353484: am a7b64e59: Merge "More audio terminology."

* commit '1f353484ce60b6b37212b5b87a6029026e987977':