Automatic translation import

Change-Id: I1f9fc1e3a15c77fd725c3cae8ab619199cdfe04a
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cr/cm-11.0' into kk