Automatic translation import

Change-Id: I190eef2263129474f10b230d2075099a6b763ee6
Automatic translation import

Change-Id: I9c26c477bb30cbc58b99b1aa5682655cc4863d3e
Merge branch 'cm-11.0' into stable/cm-11.0