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

Change-Id: Idab0563abba0ef08b40f56b804b242f44f0f2d10