Automatic translation import

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