am 92db65c1: am 487e7b3a: Merge "Revert "Revert "Support unresolved fields in optimizing""

* commit '92db65c19545bb56571ec8bdcd51430f264fb7ac':
  Revert "Revert "Support unresolved fields in optimizing"