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

Change-Id: Icb51ea38adfe76542124f78babff6a91b9fad0d8