Fix Tilapia

Change-Id: Ib558b261ddbf90c9dd2a94f3041928035fd937af