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

Change-Id: If686cbc8844e0dd19d1f37b1012aa1159bafe78e