Automatic translation import

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