am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c  -s ours automerge: 52ea677  -s ours
automerge: d20609f  -s ours

* commit 'd20609f642d8455f8cf548ac0ca42c732931b891':