Automatic translation import

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