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

Change-Id: I7a5a10cdd3f24205e95ea0e00e95ce2b11be8709