Automatic translation import

Change-Id: I0642efebeb6cfd871fe96e41f00361f1c49780f4
Merge remote-tracking branch 'cm/cm-11.0' into ose