Automatic translation import

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