Automatic translation import

Change-Id: Ibc403f195a4cba98c4ee6be2a2feccfc70c226f0
Automatic translation import

Change-Id: I68fed90404753825f0b0e1fed6e29e5de4b6b3ed
Revert "Automatic translation import"

This reverts commit 37459dfe8c379de64c5a1fcea2e53a09def9ba28.

Change-Id: I00c7f5693604455d0e0aa3411ab2f3cbe6591ac1
Automatic translation import

Change-Id: I66ffe81d2fdaa22eeacf7efdf9d244ab037151e4
Automatic translation import

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