Import translations. DO NOT MERGE am: 47c5b614dd  -s ours
am: c5fe9fffb7  -s ours

Change-Id: I46c266c93dea4d69acde18a087b002587a61226c