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

Change-Id: I18553a43f293c1d02a1a7d4a8c9e8c0d74fb9cb7