Automatic translation import

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