am 05c8f17f: Merge "resolver list is not cleared on rebuild"

* commit '05c8f17f05ca83573f7670191e6dec91497dc742':
  resolver list is not cleared on rebuild