am 7c2af29e: Merge "Add throttle to have pipe fill at more stable rate" into jb-dev

* commit '7c2af29ebced41b1b7ed32910cc9b587fb8bbf5c':
  Add throttle to have pipe fill at more stable rate