LockClock: Strings tweak

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