am aa313f80: am cdb85087: am 2b25ba3c: Merge "[optimzing] Fix codegen bug and improve type propagation"

* commit 'aa313f80217d3ada4e65c444dac99c5a6a667ee3':
  [optimzing] Fix codegen bug and improve type propagation