Automatic translation import

Change-Id: Icebb6fd82be25ae9e15328a8c04dd12d8c87caa6
Automatic translation import

Change-Id: I5d91b2ea8ad712842e7e3b5f952e15a8a99b9384
Automatic translation import

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