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

Change-Id: I5fbbb17349784d03f9ebc45f5fc351d95901d2b7