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

Change-Id: Ifd03b185b954339ccf05166a8cf323aeb74e064c