ChaOS changes

Change-Id: I98030c9c9dd8208b375a19c1306c4274f57a2f01
More ChaOS changes

Change-Id: I89e58675b1670007813282718a16c219e18769ce