Automatic translation import 

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