Automatic translation import

Change-Id: I8b8ed4001c5cba610635954ade85ea594fc52396
Merge branch 'upstream/cm-11.0'