Automatic translation import

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