Import remaining audio fixes from M7 via M7 src and Joelz tree.