[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a87e56c97a -s ours
am: 9451669468 -s ours
Change-Id: I995df18ecb0ed2374cb9301ecbee0899bb58293e
This commit is contained in: