am af172519: am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev

* commit 'af1725190fbb8dd7c29726f8b7c072f3af734aed':
  Replace stream wrap-function w/ more specific ones