Automatic translation import

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