Automatic translation import

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