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

Change-Id: Iea5970e8bd1452b7a4f6c5404e2e5b45474f77c8