Automatic translation import

Change-Id: Icb77a2c1f07d2e54f64928f32f0b16482772fe47
Settings: Fix merge derp

Change-Id: I27863c2106001949f33c2739ed9b50838d382889
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0-beta