Automatic translation import

Change-Id: I36a62a8e2a5a0d5acde42a190ebc68379067485f
Automatic translation import

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