Automatic translation import

Change-Id: I702090540091dbd04393bf4294dfc2cc0fd3b7cd
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0