Automatic translation import

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