Automatic translation import

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