Automatic translation import

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