Automatic translation import

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