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

* commit '7c4354fa9258b66f07a0153cd12269ebe459f951':
  Improve ParallelMoveResolver to work with pairs.