Convert from CM to Chaos

Change-Id: I8fa519d92492b22fc5312700b9127531ca7f6b54