Automatic translation import

Change-Id: I0f44707a6b9f58ba1690513243fa8664d506e425
Automatic translation import

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