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

* commit 'fd5291721e0ec292590673bebb6064b2b463677c':