Updates for tilipa

Change-Id: Ibb60d8d04dddb772fb76ad41e06389a91e11b2fa