Automatic translation import

Change-Id: If0538626434a25f4c930bca8e992ce0ae3eda85c
Automatic translation import

Change-Id: Icf9b1377f5631adb88c331aca76ced07f061877c
Automatic translation import

Change-Id: If91b40b51b8d8e341c7188aa79c78a30b9ee9227
Merge branch 'upstream/cm-11.0'