Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3f1a583000  -s ours

Change-Id: I0a91bc2f2e6fbdf58d72181538abdcf1e0ca8a7a