Merge "Remove unreachable code paths in constant folding." am: d9ad7463ed
am: 3f3d7e5257

* commit '3f3d7e5257ca2d3c583667819b940155789ca9d0':
  Remove unreachable code paths in constant folding.