Initial translation import

Change-Id: I47fbeb2f7aaf7a93b458b58142a827974a893fb3
Automatic translation import

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