am a57a17ec: Merge "Audio latency cleanup"

* commit 'a57a17eca99aa8cc08ffa31c15a7a5b3df9b8b35':
  Audio latency cleanup