Automatic translation import

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