Automatic translation import

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