Merge "Fix braino in parallel move resolver." am: 6132a3884a
am: ab971e37cf

* commit 'ab971e37cfecf46e33fd09ce3d18d7b95112818c':
  Fix braino in parallel move resolver.