am 06c964d9: am 9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev

* commit '06c964d9b31ac81d3521f97427cdab77ee7d1cff':
  Eliminate latency when resampling is disabled