Add taimen and walleye support to the common tool BUG:36396200 Change-Id: I954bc88a6963e33890a415cbff8795d31b3b5f38