LockClock: Remove ghost setting

Change-Id: I0bc973b2850869c41472bf32c1d18619ba276a67
Merge branch 'cm-11.0' into martincz