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

Change-Id: I7779638cf7eabcc68a8ad425efeba98d4edd2723