Updates for tilipa

Change-Id: I6df7ff3e11984ba12bd453f97727a79b3ce840e6