Automatic translation import

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