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

Change-Id: Ic01289aa59632d36973e9116ba799078f260d0b3