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

Change-Id: I04a086ab0018053ac6fa7c3efa98b66cdeb2c99f