Automatic translation import

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