Merge "DO NOT MERGE Codecs: Fix EOS handling in soft codecs" into nyc-dev