Merge "Fix encoder uninitialized read errors reported by drmemory"