Automatic translation import

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