Automatic translation import

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