Automatic translation import 

Change-Id: I7d6e411ead230594d4a249cc44fa5f61be7e7bb8
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0