Automatic translation import

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