LockClock: Missing strings and a few changes

Change-Id: I9d786f63257cca2d108b028d0fdae25303516c69
Merge "LockClock: Missing strings and a few changes" into cm-10.1