Automatic translation import

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