Merge "Adding Tri-states to the connection manager locality check."