Resolve the equivalence sets between procs properly.

Change-Id: I39f7b93bcb56ad1959c4b3fd9bcfae4eaf4acad7
Merge topic 'fix_parallel_amrconnectivity' into next

2d57abf Resolve the equivalence sets between procs properly.