Add taimen and walleye support to the common tool
am: bce5227e03

Change-Id: Idcca850479bb6c4162bf27be95537ac614a638e2