Automatic translation import

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