Updates for tilapia

Change-Id: I26d2fb3ba601321c863c677eca0b16def7c48c78