Automatic translation import

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