add missing cm things

Change-Id: I8518ed9936d5d2aca95498105fda8401ddea79a1