Automatic translation import

Change-Id: I6960af3a339a36783b080c1cd0474421c1ac1f59
Automatic translation import

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