Revert "Merge branch 'master' into test_audio"

This reverts commit 0913decaa87514e7be0776a2c710c99135889d4f, reversing
changes made to cb45e6a7a16259b1e9cab247101d7ae752fd2f54.
Revert "Merge branch 'master' into test_audio"

This reverts commit 0913decaa87514e7be0776a2c710c99135889d4f, reversing
changes made to cb45e6a7a16259b1e9cab247101d7ae752fd2f54.