Automatic translation import

Change-Id: Ia1b62b2bcc0e6cbc436a43f32aea117a31d815f0
Merge commit 'e094472b306aedd4a97f6616a1a4a2c5ee0c3ddd' into cm-11.0