Automatic translation import

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