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

Change-Id: I49eb237bb4f4c2ac5230b7a18a38c024d90650ef