am 82aba97c: am fc5b096f: Merge "Fix codegen_test."

* commit '82aba97c37883f8a239ed1ef85e0a503c600883f':
  Fix codegen_test.