Import translations. DO NOT MERGE am: 717de1098c  -s ours
am: 0d513ac8af  -s ours

Change-Id: I2ce3f6f025b89ef5a35ba5a1132c6a08b523038b