Automatic translation import

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