Automatic translation import

Change-Id: Ifb0ae1869ff6b63e11fa1a5ce7a931e200062faf
Automatic translation import

Change-Id: I2dcb87e7c5247d7b0f4a5886ad1b0cedf01aeda1
Merge remote-tracking branch 'cm/cm-11.0' into HEAD