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

Change-Id: I775851b60f740426e1d179d67d8ee026f318b4cc