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

Change-Id: If64861eb84ebd0ba83fcba14b6e0120d90782865