Adapt for TitanOS

Change-Id: I912d51a1a6ba95fdc185700283ca228bf909d308