am 271d30dd: Merge "Revert "Support unresolved fields in optimizing" breaks debuggable tests."

* commit '271d30dd847fb72d78d3178b8b3b225192c2d1c0':
  Revert "Support unresolved fields in optimizing" breaks debuggable tests.