Automatic translation import

Change-Id: I2303f2b924d38b2451b63f41c021a72b04b8a0ad
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0