Automatic translation import

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