Automatic translation import

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