Automatic translation import 

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