LockClock: AF Translations

Change-Id: Id7e1c59f0dee7bc461022196d6562b5a4e9c9c76
Merge "LockClock: AF Translations" into cm-11.0