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

Change-Id: I059de7982f83af09cf8b92fcd699bdca29d33b85