Automatic translation import

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