am fc5b096f: Merge "Fix codegen_test."

* commit 'fc5b096fcddb0ddb2d01e2b28e86ed5a02d37b2e':
  Fix codegen_test.