Automatic translation import

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