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

Change-Id: I284dc2837527a07ce0336494f4af9b05cf81b205