Adapt for Titan

Change-Id: I74fec05e73c5236c9cca0f10f9e60d460cb798e9