Automatic translation import

Change-Id: I1d6a363140deba430a2c9babb31504ac6ef7cd57
Automatic translation import

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