Automatic translation import

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