Import translations. DO NOT MERGE am: 5ad7d6e328  -s ours
am: a3e34d4384  -s ours

Change-Id: I4b6b7b363fc8e7a5fb4610bd650928acdfda5763