Automatic translation import

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