change more for CM

Change-Id: I0fde00835b0b0aae9c01a789eb63e5f0660a0b23