Automatic translation import

Change-Id: I0bbffc4b657390732c3c04d4ea9467984f83705e
Automatic translation import

Change-Id: I20f31d41fdc4d74d01ec9c83f3d8e2d7dcad4fe0
Automatic translation import

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