Import translations. DO NOT MERGE am: 28b67f8eea  -s ours
am: 9839965b25  -s ours

Change-Id: I0b93748069282ecd14fdcba5341c961913df0432