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

* commit '487e7b3aca83d6e7d52f86b73eaa359f23993fcb':
  Revert "Revert "Support unresolved fields in optimizing"