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

Change-Id: Ie429b0cc60b4c7fdc1e501b01ed49523b38cee7a