LockClock: Move over Chronus Translations

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