Automatic translation import

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