Automatic translation import

Change-Id: I4d2a0f4ef4a9c09d78aac8a2cd31c92c1acaa55e
Automatic translation import

Change-Id: Ib4e121c623d0a4cd7dcbf480f9f396a15d400964
Merge branch 'cm-11.0' into stable/cm-11.0