Import translations. DO NOT MERGE
am: 98d08adc0c  -s ours

Change-Id: I70074d478080acf32c5458b03ac8bbe9bdec3b2a