Changing files for ChaOS

Change-Id: Ie322a973e174501cd4978fbabaf687f3808fe65d