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

Change-Id: I60afc08729822714aa80d5fe73a6163ee06620e2