Automatic translation import

Change-Id: I046abfaa946d1193c256f9cf87e63df60e601f61
Revert "Automatic translation import"

This reverts commit c4ef906c285b034415e5d4d162f569986538157b.

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