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

* commit 'a0dcc12eb66253ab6ce2493e108c65fcf993be62':