Automatic translation import

Change-Id: Ib381078a3497d94eac0f49794269412e4a3c654f
Automatic translation import

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