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

Change-Id: I2ee0f0190134b511dcf5ee30d562c3623c5b4d51