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

Change-Id: I3bc624c630daf6f8a2661ec04455f6bb053352cc