Automatic translation import

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