Import translations. DO NOT MERGE am: a829ea2a1b  -s ours
am: 41c5dcaad0  -s ours

Change-Id: I510a98e91b45c31fa060b414f59e9a25a8aeda92