Automatic translation import

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