Automatic translation import

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