Automatic translation import

Change-Id: Ic5f770aa7814be46204dfe14cecc4c9537aff856
Automatic translation import

Change-Id: Iafc41df0123212689bb950cd1d910c6dbabc81b6
Revert "Automatic translation import"

This reverts commit 1fe1dd34062e4b5a702467a9ac958c1deecfa492.

Change-Id: I9e0699d544fdeebe16f280c7ecd8adde097be385
Automatic translation import

Change-Id: Ia9bbe23b34fd0c0408f18c2c8a3218e37ba316d6
Automatic translation import

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