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

Change-Id: Ic8a10cbca1211f848a51841770eab00d0fdedfbe