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

Change-Id: Iba4c3d363140ccae540cbcbe47eeac262c2a671d