Automatic translation import 

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