Import translations. DO NOT MERGE am: e7f9b0b30b  -s ours
am: f8b4927683  -s ours

Change-Id: I9d28fc31d3dc6ead839e36b000d16cec353562fd