Fix an edit. Get rid of CM.

Change-Id: If25bd5896a309222fb832b229b800145c0174f8f