Automatic translation import

Change-Id: I2aa37009acfdd679fdebf671c8d21c7b5e96cca3
Merge branch 'cm' into HEAD