Automatic translation import

Change-Id: Ia2949c44b1fee77823343a93b5044a81644ed58e
Automatic translation import

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