Automatic translation import

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