Automatic translation import

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