Automatic translation import

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