Automatic translation import

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