Automatic translation import

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