am 4215f434: am 6dbcebd0: Merge "Always release a buffer" into klp-modular-dev

* commit '4215f434187d518bf8c9807c9a18a7e0b617f7d2':
  Always release a buffer