KeyChain: AF translation

Change-Id: I54a08eed3322f2822075a405e6883cbc3be6c19d
Merge "KeyChain: AF translation" into cm-10.1