am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf  -s ours automerge: ed394bc  -s ours
automerge: 953705d  -s ours

* commit '953705d721627558bbdcd0c014ba3a95f073f4da':