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

* commit '053beefe08bbce6c019c6505c5a27ae9199e5435':
  Revert "Support unresolved fields in optimizing" breaks debuggable tests.