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

Change-Id: I13498496e2fa836a5fc06c1c8fe1a89491fd8e4d