Automatic translation import

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