Track CM LockClock

Change-Id: I318440b4bef5816d2ecaa59005f87d30b3729361