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

Change-Id: I156e834970075f0c1a449c6b404f164335ab9fba