Add CMs LockClock

Change-Id: I19265f44115e4b5fc87e62b17f0e74ccab848ced