Automatic translation import

Change-Id: I8553aa668fd3380665c130a029d785a5ed9c134d
Automatic translation import

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