Import translations. DO NOT MERGE am: 6dc837f102  -s ours
am: f3e1874420  -s ours

* commit 'f3e1874420a5705173acf51b819763a624c840fa':

Change-Id: I8fdd9fd8f2ea6f0b94abce02f26b077e4a0bfa7a