add tilapia and grouper support

Change-Id: Icf4539a8d990294fcd795b348f28c28d64dbbc5d