Update and revert CM changes

Change-Id: Ie6e39fc9e27923b8f825a6f07baf98e543fd0c91