Import translations. DO NOT MERGE
am: b4f16b10af  -s ours

Change-Id: I0b3cf2e8204f78f342754b06988bd63344e72fa7