Automatic translation import

Change-Id: I3d5d55aee9a93dca4d3818e89c01a48a526d49fa
Merge remote-tracking branch 'cm/cm-11.0' into wszf