Automatic translation import

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