Automatic translation import

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