Automatic translation import

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