Merge "Remove FD optimization case for decodeStream" into klp-dev