Automatic translation import

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