Automatic translation import

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