Merge "Fix segv without --enable-error-concealment"