Automatic translation import

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