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

Change-Id: I93b6417a13e9682cc29befcd41ce97db5e81b06b