Automatic translation import

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