Automatic translation import

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