Automatic translation import

Change-Id: I614f5840412ccd8416aef369b0b01e20bb5f41a2
Automatic translation import

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