Automatic translation import

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