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

Change-Id: I2f8b37bf4dbea38e570ab90bd34631a97638defd