Automatic translation import

Change-Id: I8052ca1b24a8b4bd74f8a2995b99f676810529f2
Automatic translation import

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