Automatic translation import

Change-Id: Id1c9ad8065af23009a0598cf8534b2169368a87e
Automatic translation import 

Change-Id: Icd2f93c43ffb863b0f3334fafc8f8d91037e56d0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0