Automatic translation import

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