Automatic translation import

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