ChaOS changes

Change-Id: Ib1bff7e01e84d6bacd325cb315907733d175a94f