Automatic translation import

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