Automatic translation import

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