Automatic translation import

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