Automatic translation import 

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