Automatic translation import

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