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

Change-Id: I4c077587be4af57d32cb879f53740b2a56f46872