Adapted for TitanOS

Change-Id: I0f7e20abc60d847d60a28c9699981f077ffc82ec