Automatic translation import

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