Automatic translation import

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