am 017719a0: Merge "Support unresolved fields in optimizing"

* commit '017719a03c7c111a2069b5f85e3b9c81566c0902':
  Support unresolved fields in optimizing