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

Change-Id: I622bec42749f2d09796ee420e9d8b7ebb58ef08a