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

* commit 'e4db4e2b9dca065fbbf9f10dd5b9e961a9acef46':
  resolver list is not cleared on rebuild