Import translations. DO NOT MERGE am: 99d1abb252  -s ours
am: 7067b4a34f  -s ours

Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440