Automatic translation import

Change-Id: I605bceda353b3287d38831d70f51eb88a9559a94
Automatic translation import

Change-Id: I3d67091507ae54cd16f2a1b60a7226016bd50c6e
Merge branch 'upstream/cm-11.0'