Automatic translation import

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