taimen&walleye builds have overriding commands
am: 55a3497cda

Change-Id: I3121733556846b51e3134c636b8ee7419cfdf821