Automatic translation import

Change-Id: Ic0f72dff66e0de7e70552cfb60b06412038bf7bd
Automatic translation import

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