Automatic translation import

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