Automatic translation import

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