Automatic translation import

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