Automatic translation import

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