Automatic translation import

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