cLock: DA translation

Change-Id: I113ac3d6e347bbecf8b9e2485baa2f9d49018b04
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2