Automatic translation import

Change-Id: If0538626434a25f4c930bca8e992ce0ae3eda85c
Automatic translation import

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