Automatic translation import

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