Catch our own Tilapia

Change-Id: I2c9a884d8799403dabe6acab5bbc182723729f05