Automatic translation import

Change-Id: I68fed90404753825f0b0e1fed6e29e5de4b6b3ed
Revert "Automatic translation import"

This reverts commit 37459dfe8c379de64c5a1fcea2e53a09def9ba28.

Change-Id: I00c7f5693604455d0e0aa3411ab2f3cbe6591ac1
Merge branch 'cm-11.0' into kk_mkt