Automatic translation import

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