Automatic translation import

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