Automatic translation import

Change-Id: I4462c2a92d6387e62a6fe4bd7b1d3beadce30fc5
Automatic translation import

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