Automatic translation import 

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