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

* commit '6a181b4c2b8fdcb8a472f6bcea980d8827d18c61':
  Support unresolved fields in optimizing