am 2e1391b9: Merge "Fix code generation with materialized conditions."

* commit '2e1391b9abdafdbe7e0ef5ef116c49f812394056':
  Fix code generation with materialized conditions.