align CM

Change-Id: I2a3987358d7b1937a54960fb141012d8aee678ee