Automatic translation import

Change-Id: I4b3e04889722e960b79dd3644bcd7150a4065c44
Automatic translation import

Change-Id: Id85c13596f30a37838788c28f24b6769c847b6fd
Merge commit '85d7e1b3c29978f806b161ceb7c6ea0fd00b7131' into cm-11.0