Automatic translation import

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