Automatic translation import

Change-Id: I3b4236f095b51ee4626c33a9d4db5d3bd0498ee4
Automatic translation import

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