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

Change-Id: Ia8c74ab379b660f593afc8bb14b3560542f574c9