Automatic translation import

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