Automatic translation import

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