Automatic translation import

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