Merge "Fix codegen_test."