Automatic translation import

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