Import translations. DO NOT MERGE am: 2cfe8bec9b  -s ours
am: a127139e5b  -s ours

Change-Id: I71a0f761a75570fb30d446134c99b1005057a2b4