Automatic translation import

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