Automatic translation import

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