Automatic translation import

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