Automatic translation import

Change-Id: I788a3872b063578255b305f49a8c22b3da5eaf90
Automatic translation import

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