Automatic translation import

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