am 0da7a26e: Merge "Fix codegen_test."

* commit '0da7a26e1ae2a701529c5c15c280f3efae0ccec0':
  Fix codegen_test.