Automatic translation import

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