Automatic translation import

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