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

Change-Id: I2abdd1b30fc382712b208d383310833d7fc70c61