Automatic translation import

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