Automatic translation import

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