Automatic translation import

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