Automatic translation import

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