Automatic translation import

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