am 1d6957f0: Merge "Improve ParallelMoveResolver to work with pairs."

* commit '1d6957f0b9d560c75a1901a83a45b4f3510a1015':
  Improve ParallelMoveResolver to work with pairs.