Automatic translation import

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