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

Change-Id: I0f4d2c691667d9e15d6628f0507f101b85676348