Revert CM update

Change-Id: I756660a3460369f74533beb4a43f922987c1881b