LockClock: DA translation

Change-Id: I2887d1b9f70974a0e288f25e304c3015e6b1b65e
Merge branch 'cm-10.2' into martincz