Automatic translation import

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