Import translations. DO NOT MERGE am: b3a6a7afe4  -s ours
am: 5be5a57151  -s ours

Change-Id: I70452a8fe24a4b32d21f609e15d4eeaf9704b850