Automatic translation import

Change-Id: I6f77914d5f73bc572283392158a1969bce1c3277
Automatic translation import

Change-Id: I689f366587301b9a8383586c3c7a1683aa5f1dfe
Merge branch 'upstream/cm-11.0'