Updates for TitanOS

Change-Id: I7e4f8ade47421504920658acc65760adcbe968cd