Remove duplicated Tilapia props... aka fix build

Change-Id: I96c9249c286b8d51702269c96addb82510fa239a
Merge "Remove duplicated Tilapia props... aka fix build" into jb43