Merge "Construct NeighborCell from CellInfo"