Automatic translation import

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