Automatic translation import

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