Merge "Import translations. DO NOT MERGE" into pi-dev am: ed682cc676  -s ours
am: 70eba7f99e  -s ours

Change-Id: Idbfb5879f0e42368105c4eac5ed39e7d45162919