Automatic translation import

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