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

Change-Id: I5b6323a6898d53e2fa383d29f8b1eea2ef8af5ad