Automatic translation import

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