[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 5f14fa5049  -s ours

Change-Id: I9337472a11df5339dbe17d95c49eb3e1eae5c321