Merge "Fix MismatchError for LB scenario test"