Automatic translation import

Change-Id: Ic8724edcccc194efa01ed56caad67c46909ba6c7
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cr/cm-11.0' into kk