Automatic translation import

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