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

Change-Id: I7ba6226996fb458bdd1f240a9b52c0401d879d5e