Import translations. DO NOT MERGE am: b4fc70cf71  -s ours
am: b4cca0b576  -s ours

Change-Id: Ic9b0413f075b37fc8cfe6bd9b5c301e7acaa5388