am 7fc11d3b: Merge "Adjust output buffer size and sample rate" into jb-dev

* commit '7fc11d3babd5f0d69f8a2be07b73627f2e881c56':
  Adjust output buffer size and sample rate