am 036c408b: Merge "Minor fix in codegen tests."

* commit '036c408b6a7b4a6cb037fea876bf67fe2543dfba':
  Minor fix in codegen tests.