Automatic translation import

Change-Id: I3fa56f5f124c58f1e292799243c1943afc63d746
Automatic translation import

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