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

Change-Id: Ifb219f0cb7769d26b12e46a6d26848694f669d9e