Automatic translation import

Change-Id: Ie500b688966b0fb64b2434d3bc0bd286753ecf05
Automatic translation import

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