am 2b2fbe29: Merge "Fix decoder EOS handling"

* commit '2b2fbe299163b544668b41f594943a19b78dafd3':
  Fix decoder EOS handling