Automatic translation import

Change-Id: I2e89ebacfb2d0a0980dfbc331ab3e0e7cc11cf5a
Merge branch 'upstream/cm-11.0'