Automatic translation import

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